Merge branch 'feature/erenfro/kitchen-fixes' of Linux-Help/cookbook-apt-zabbix into develop

This commit is contained in:
psi-jack 2016-12-24 16:21:19 +00:00 committed by Gogs
commit 2d549ff371
3 changed files with 32 additions and 17 deletions

View file

@ -1,28 +1,26 @@
--- ---
driver: driver:
name: vagrant name: vagrant
provisioner: provisioner:
name: chef_zero name: chef_zero
environments_path: test/environments nodes_path: test/fixtures/nodes
chef_client_path: /usr/bin/chef-client clients_path: test/fixtures/clients
client_rb: environments_path: test/fixtures/environments
environment: integration_test_env data_bags_path: test/fixtures/data_bags
chef_client_path: /usr/bin/chef-client
client_rb:
environment: test
platforms: platforms:
- name: deb8 - name: debian-8.6
driver: driver_config:
box: lh-debian vm_hostname: integration.deb.test
box_url: http://repos.home.ld/vagrant/box/lh-debian.json require_chef_omnibus: false
vm_hostname: integration.deb.test
vagrantfile_erb: test/Vagrantfile.erb
require_chef_omnibus: false
suites: suites:
- name: deb8 - name: default
run_list: run_list:
- recipe[apt-zabbix::default] - recipe[apt-zabbix::default]
attributes: attributes:
includes:
- deb8

17
test/fixtures/environments/test.json vendored Normal file
View file

@ -0,0 +1,17 @@
{
"id": "test",
"name": "test",
"description": "placeholder for integration testing",
"cookbook_versions": {
},
"json_class": "Chef::Environment",
"chef_type": "environment",
"default_attributes": {
},
"override_attributes": {
}
}

View file

@ -16,7 +16,7 @@ describe 'apt-zabbix::default' do
it { should be_mode 644 } it { should be_mode 644 }
it { should be_owned_by 'root' } it { should be_owned_by 'root' }
it { should be_grouped_into 'root' } it { should be_grouped_into 'root' }
its(:content) { shoult match('deb ... jessie contrib non-free main') } its(:content) { should match('deb "http://repo.zabbix.com/zabbix/3.0/debian" jessie main') }
end end
end end
end end