From ea085ef7c0df9ad99a0f2ca936102efee4e1f675 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Mon, 1 Feb 2016 17:00:44 +0100 Subject: [PATCH 1/6] place empty iso in tmp directory --- test/integration/cookbooks/os_prepare/recipes/mount.rb | 4 ++-- test/integration/test/integration/default/file_spec.rb | 5 +++-- test/integration/test/integration/default/mount_spec.rb | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/integration/cookbooks/os_prepare/recipes/mount.rb b/test/integration/cookbooks/os_prepare/recipes/mount.rb index c90fec289..6301ab6b5 100644 --- a/test/integration/cookbooks/os_prepare/recipes/mount.rb +++ b/test/integration/cookbooks/os_prepare/recipes/mount.rb @@ -9,7 +9,7 @@ when 'ubuntu', 'rhel', 'centos', 'fedora' # copy iso file for mount tests # NB created using `mkdir empty; mkisofs -o empty.iso empty/` - cookbook_file '/root/empty.iso' do + cookbook_file '/tmp/empty.iso' do owner 'root' group 'root' mode '0755' @@ -26,7 +26,7 @@ when 'ubuntu', 'rhel', 'centos', 'fedora' # mount -o loop /root/empty.iso /mnt/iso-disk mount '/mnt/iso-disk' do - device '/root/empty.iso' + device '/tmp/empty.iso' options 'loop' action [:mount, :enable] end diff --git a/test/integration/test/integration/default/file_spec.rb b/test/integration/test/integration/default/file_spec.rb index 5ed03fa9b..c55e31d79 100644 --- a/test/integration/test/integration/default/file_spec.rb +++ b/test/integration/test/integration/default/file_spec.rb @@ -125,6 +125,7 @@ if os.unix? end end +# check file mount on linux if os.linux? # for server spec compatibility # Do not use `.with` or `.only_with`, this syntax is deprecated and will be removed @@ -133,7 +134,7 @@ if os.linux? it { should be_mounted } it { should be_mounted.with( :type => 'iso9660' ) } it { should be_mounted.with( :type => 'iso9660', :options => { :ro => true } ) } - it { should be_mounted.with( :type => 'iso9660', :device => '/root/empty.iso' ) } + it { should be_mounted.with( :type => 'iso9660', :device => '/tmp/empty.iso' ) } it { should_not be_mounted.with( :type => 'ext4' ) } it { should_not be_mounted.with( :type => 'xfs' ) } end @@ -142,7 +143,7 @@ if os.linux? # also see mount_spec.rb describe file('/mnt/iso-disk') do it { should be_mounted.only_with( { - :device=>"/root/empty.iso", + :device=>"/tmp/empty.iso", :type=>"iso9660", :options=>{ :ro=>true} diff --git a/test/integration/test/integration/default/mount_spec.rb b/test/integration/test/integration/default/mount_spec.rb index e4fca6a95..c9c23ec86 100644 --- a/test/integration/test/integration/default/mount_spec.rb +++ b/test/integration/test/integration/default/mount_spec.rb @@ -5,7 +5,7 @@ if os.linux? describe mount '/mnt/iso-disk' do it { should be_mounted } its('count') { should eq 1 } - its('device') { should eq '/root/empty.iso' } + its('device') { should eq '/tmp/empty.iso' } its('type') { should eq 'iso9660' } its('options') { should eq ['ro'] } end From 8433b55fc4779d1f4a16d90fadb2bd1d434629ca Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Mon, 1 Feb 2016 17:00:54 +0100 Subject: [PATCH 2/6] do not install postgres on ubuntu 15.10 --- test/integration/cookbooks/os_prepare/recipes/postgres.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/integration/cookbooks/os_prepare/recipes/postgres.rb b/test/integration/cookbooks/os_prepare/recipes/postgres.rb index 858fd1ace..d6b70bdb5 100644 --- a/test/integration/cookbooks/os_prepare/recipes/postgres.rb +++ b/test/integration/cookbooks/os_prepare/recipes/postgres.rb @@ -6,6 +6,12 @@ # hw-cookbooks/postgresql is tested on these platforms case node['platform'] when 'ubuntu', 'centos' + + # also skip it on ubuntu 15.10, because the cookbook is not supported + # with `enable_pgdg_apt` yet + return if node['platform_version'] == "15.10" + + node.default['postgresql']['enable_pgdg_apt'] = true node.default['postgresql']['config']['listen_addresses'] = 'localhost' node.default['postgresql']['password']['postgres'] = 'md506be11be01439cb4abd537e454df34ea' # "inspec" include_recipe 'postgresql::server' From 1d043bfebc89586eb624cc5bb16b63e2d6f0bd51 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Thu, 18 Feb 2016 21:24:25 +0100 Subject: [PATCH 3/6] move kitchen integration tests to top-level --- .../.kitchen.ec2.yml => .kitchen.ec2.yml | 0 test/integration/.kitchen.yml => .kitchen.yml | 0 test/integration/Berksfile => Berksfile | 0 .../cookbooks/os_prepare/files/empty.iso | Bin .../cookbooks/os_prepare/files/example.csv | 0 .../cookbooks/os_prepare/files/example.ini | 0 .../cookbooks/os_prepare/files/example.json | 0 .../cookbooks/os_prepare/files/example.yml | 0 .../cookbooks/os_prepare/metadata.rb | 0 .../os_prepare/recipes/_runit_service_centos.rb | 0 .../os_prepare/recipes/_upstart_service_centos.rb | 0 .../cookbooks/os_prepare/recipes/apache.rb | 0 .../cookbooks/os_prepare/recipes/apt.rb | 0 .../cookbooks/os_prepare/recipes/auditctl.rb | 0 .../cookbooks/os_prepare/recipes/default.rb | 0 .../cookbooks/os_prepare/recipes/file.rb | 0 .../cookbooks/os_prepare/recipes/iptables.rb | 0 .../os_prepare/recipes/json_yaml_csv_ini.rb | 0 .../cookbooks/os_prepare/recipes/mount.rb | 0 .../cookbooks/os_prepare/recipes/package.rb | 0 .../cookbooks/os_prepare/recipes/postgres.rb | 0 .../cookbooks/os_prepare/recipes/registry_key.rb | 0 .../cookbooks/os_prepare/recipes/service.rb | 0 .../templates/default/sv-default-svlog-run.erb | 0 .../{test/integration => }/default/_debug_spec.rb | 0 .../integration => }/default/apache_conf_spec.rb | 0 .../{test/integration => }/default/apt_spec.rb | 0 .../integration => }/default/auditd_rules_spec.rb | 0 .../default/compare_matcher_spec.rb | 0 .../{test/integration => }/default/csv_spec.rb | 0 .../integration => }/default/etc_group_spec.rb | 0 .../{test/integration => }/default/file_spec.rb | 0 .../{test/integration => }/default/group_spec.rb | 0 .../{test/integration => }/default/ini_spec.rb | 0 .../{test/integration => }/default/iptables_spec.rb | 0 .../{test/integration => }/default/json_spec.rb | 0 .../integration => }/default/kernel_module_spec.rb | 0 .../default/kernel_parameter_spec.rb | 0 .../{test/integration => }/default/mount_spec.rb | 0 .../{test/integration => }/default/os_spec.rb | 0 .../{test/integration => }/default/package_spec.rb | 0 .../{test/integration => }/default/port_spec.rb | 0 .../default/postgres_session_spec.rb | 0 .../integration => }/default/registry_key_spec.rb | 0 .../{test/integration => }/default/secpol_spec.rb | 0 .../{test/integration => }/default/service_spec.rb | 0 .../{test/integration => }/default/user_spec.rb | 0 .../{test/integration => }/default/yaml_spec.rb | 0 48 files changed, 0 insertions(+), 0 deletions(-) rename test/integration/.kitchen.ec2.yml => .kitchen.ec2.yml (100%) rename test/integration/.kitchen.yml => .kitchen.yml (100%) rename test/integration/Berksfile => Berksfile (100%) rename test/{integration => }/cookbooks/os_prepare/files/empty.iso (100%) rename test/{integration => }/cookbooks/os_prepare/files/example.csv (100%) rename test/{integration => }/cookbooks/os_prepare/files/example.ini (100%) rename test/{integration => }/cookbooks/os_prepare/files/example.json (100%) rename test/{integration => }/cookbooks/os_prepare/files/example.yml (100%) rename test/{integration => }/cookbooks/os_prepare/metadata.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/_runit_service_centos.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/_upstart_service_centos.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/apache.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/apt.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/auditctl.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/default.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/file.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/iptables.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/json_yaml_csv_ini.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/mount.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/package.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/postgres.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/registry_key.rb (100%) rename test/{integration => }/cookbooks/os_prepare/recipes/service.rb (100%) rename test/{integration => }/cookbooks/os_prepare/templates/default/sv-default-svlog-run.erb (100%) rename test/integration/{test/integration => }/default/_debug_spec.rb (100%) rename test/integration/{test/integration => }/default/apache_conf_spec.rb (100%) rename test/integration/{test/integration => }/default/apt_spec.rb (100%) rename test/integration/{test/integration => }/default/auditd_rules_spec.rb (100%) rename test/integration/{test/integration => }/default/compare_matcher_spec.rb (100%) rename test/integration/{test/integration => }/default/csv_spec.rb (100%) rename test/integration/{test/integration => }/default/etc_group_spec.rb (100%) rename test/integration/{test/integration => }/default/file_spec.rb (100%) rename test/integration/{test/integration => }/default/group_spec.rb (100%) rename test/integration/{test/integration => }/default/ini_spec.rb (100%) rename test/integration/{test/integration => }/default/iptables_spec.rb (100%) rename test/integration/{test/integration => }/default/json_spec.rb (100%) rename test/integration/{test/integration => }/default/kernel_module_spec.rb (100%) rename test/integration/{test/integration => }/default/kernel_parameter_spec.rb (100%) rename test/integration/{test/integration => }/default/mount_spec.rb (100%) rename test/integration/{test/integration => }/default/os_spec.rb (100%) rename test/integration/{test/integration => }/default/package_spec.rb (100%) rename test/integration/{test/integration => }/default/port_spec.rb (100%) rename test/integration/{test/integration => }/default/postgres_session_spec.rb (100%) rename test/integration/{test/integration => }/default/registry_key_spec.rb (100%) rename test/integration/{test/integration => }/default/secpol_spec.rb (100%) rename test/integration/{test/integration => }/default/service_spec.rb (100%) rename test/integration/{test/integration => }/default/user_spec.rb (100%) rename test/integration/{test/integration => }/default/yaml_spec.rb (100%) diff --git a/test/integration/.kitchen.ec2.yml b/.kitchen.ec2.yml similarity index 100% rename from test/integration/.kitchen.ec2.yml rename to .kitchen.ec2.yml diff --git a/test/integration/.kitchen.yml b/.kitchen.yml similarity index 100% rename from test/integration/.kitchen.yml rename to .kitchen.yml diff --git a/test/integration/Berksfile b/Berksfile similarity index 100% rename from test/integration/Berksfile rename to Berksfile diff --git a/test/integration/cookbooks/os_prepare/files/empty.iso b/test/cookbooks/os_prepare/files/empty.iso similarity index 100% rename from test/integration/cookbooks/os_prepare/files/empty.iso rename to test/cookbooks/os_prepare/files/empty.iso diff --git a/test/integration/cookbooks/os_prepare/files/example.csv b/test/cookbooks/os_prepare/files/example.csv similarity index 100% rename from test/integration/cookbooks/os_prepare/files/example.csv rename to test/cookbooks/os_prepare/files/example.csv diff --git a/test/integration/cookbooks/os_prepare/files/example.ini b/test/cookbooks/os_prepare/files/example.ini similarity index 100% rename from test/integration/cookbooks/os_prepare/files/example.ini rename to test/cookbooks/os_prepare/files/example.ini diff --git a/test/integration/cookbooks/os_prepare/files/example.json b/test/cookbooks/os_prepare/files/example.json similarity index 100% rename from test/integration/cookbooks/os_prepare/files/example.json rename to test/cookbooks/os_prepare/files/example.json diff --git a/test/integration/cookbooks/os_prepare/files/example.yml b/test/cookbooks/os_prepare/files/example.yml similarity index 100% rename from test/integration/cookbooks/os_prepare/files/example.yml rename to test/cookbooks/os_prepare/files/example.yml diff --git a/test/integration/cookbooks/os_prepare/metadata.rb b/test/cookbooks/os_prepare/metadata.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/metadata.rb rename to test/cookbooks/os_prepare/metadata.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/_runit_service_centos.rb b/test/cookbooks/os_prepare/recipes/_runit_service_centos.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/_runit_service_centos.rb rename to test/cookbooks/os_prepare/recipes/_runit_service_centos.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/_upstart_service_centos.rb b/test/cookbooks/os_prepare/recipes/_upstart_service_centos.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/_upstart_service_centos.rb rename to test/cookbooks/os_prepare/recipes/_upstart_service_centos.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/apache.rb b/test/cookbooks/os_prepare/recipes/apache.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/apache.rb rename to test/cookbooks/os_prepare/recipes/apache.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/apt.rb b/test/cookbooks/os_prepare/recipes/apt.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/apt.rb rename to test/cookbooks/os_prepare/recipes/apt.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/auditctl.rb b/test/cookbooks/os_prepare/recipes/auditctl.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/auditctl.rb rename to test/cookbooks/os_prepare/recipes/auditctl.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/default.rb b/test/cookbooks/os_prepare/recipes/default.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/default.rb rename to test/cookbooks/os_prepare/recipes/default.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/file.rb b/test/cookbooks/os_prepare/recipes/file.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/file.rb rename to test/cookbooks/os_prepare/recipes/file.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/iptables.rb b/test/cookbooks/os_prepare/recipes/iptables.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/iptables.rb rename to test/cookbooks/os_prepare/recipes/iptables.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/json_yaml_csv_ini.rb b/test/cookbooks/os_prepare/recipes/json_yaml_csv_ini.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/json_yaml_csv_ini.rb rename to test/cookbooks/os_prepare/recipes/json_yaml_csv_ini.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/mount.rb b/test/cookbooks/os_prepare/recipes/mount.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/mount.rb rename to test/cookbooks/os_prepare/recipes/mount.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/package.rb b/test/cookbooks/os_prepare/recipes/package.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/package.rb rename to test/cookbooks/os_prepare/recipes/package.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/postgres.rb b/test/cookbooks/os_prepare/recipes/postgres.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/postgres.rb rename to test/cookbooks/os_prepare/recipes/postgres.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/registry_key.rb b/test/cookbooks/os_prepare/recipes/registry_key.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/registry_key.rb rename to test/cookbooks/os_prepare/recipes/registry_key.rb diff --git a/test/integration/cookbooks/os_prepare/recipes/service.rb b/test/cookbooks/os_prepare/recipes/service.rb similarity index 100% rename from test/integration/cookbooks/os_prepare/recipes/service.rb rename to test/cookbooks/os_prepare/recipes/service.rb diff --git a/test/integration/cookbooks/os_prepare/templates/default/sv-default-svlog-run.erb b/test/cookbooks/os_prepare/templates/default/sv-default-svlog-run.erb similarity index 100% rename from test/integration/cookbooks/os_prepare/templates/default/sv-default-svlog-run.erb rename to test/cookbooks/os_prepare/templates/default/sv-default-svlog-run.erb diff --git a/test/integration/test/integration/default/_debug_spec.rb b/test/integration/default/_debug_spec.rb similarity index 100% rename from test/integration/test/integration/default/_debug_spec.rb rename to test/integration/default/_debug_spec.rb diff --git a/test/integration/test/integration/default/apache_conf_spec.rb b/test/integration/default/apache_conf_spec.rb similarity index 100% rename from test/integration/test/integration/default/apache_conf_spec.rb rename to test/integration/default/apache_conf_spec.rb diff --git a/test/integration/test/integration/default/apt_spec.rb b/test/integration/default/apt_spec.rb similarity index 100% rename from test/integration/test/integration/default/apt_spec.rb rename to test/integration/default/apt_spec.rb diff --git a/test/integration/test/integration/default/auditd_rules_spec.rb b/test/integration/default/auditd_rules_spec.rb similarity index 100% rename from test/integration/test/integration/default/auditd_rules_spec.rb rename to test/integration/default/auditd_rules_spec.rb diff --git a/test/integration/test/integration/default/compare_matcher_spec.rb b/test/integration/default/compare_matcher_spec.rb similarity index 100% rename from test/integration/test/integration/default/compare_matcher_spec.rb rename to test/integration/default/compare_matcher_spec.rb diff --git a/test/integration/test/integration/default/csv_spec.rb b/test/integration/default/csv_spec.rb similarity index 100% rename from test/integration/test/integration/default/csv_spec.rb rename to test/integration/default/csv_spec.rb diff --git a/test/integration/test/integration/default/etc_group_spec.rb b/test/integration/default/etc_group_spec.rb similarity index 100% rename from test/integration/test/integration/default/etc_group_spec.rb rename to test/integration/default/etc_group_spec.rb diff --git a/test/integration/test/integration/default/file_spec.rb b/test/integration/default/file_spec.rb similarity index 100% rename from test/integration/test/integration/default/file_spec.rb rename to test/integration/default/file_spec.rb diff --git a/test/integration/test/integration/default/group_spec.rb b/test/integration/default/group_spec.rb similarity index 100% rename from test/integration/test/integration/default/group_spec.rb rename to test/integration/default/group_spec.rb diff --git a/test/integration/test/integration/default/ini_spec.rb b/test/integration/default/ini_spec.rb similarity index 100% rename from test/integration/test/integration/default/ini_spec.rb rename to test/integration/default/ini_spec.rb diff --git a/test/integration/test/integration/default/iptables_spec.rb b/test/integration/default/iptables_spec.rb similarity index 100% rename from test/integration/test/integration/default/iptables_spec.rb rename to test/integration/default/iptables_spec.rb diff --git a/test/integration/test/integration/default/json_spec.rb b/test/integration/default/json_spec.rb similarity index 100% rename from test/integration/test/integration/default/json_spec.rb rename to test/integration/default/json_spec.rb diff --git a/test/integration/test/integration/default/kernel_module_spec.rb b/test/integration/default/kernel_module_spec.rb similarity index 100% rename from test/integration/test/integration/default/kernel_module_spec.rb rename to test/integration/default/kernel_module_spec.rb diff --git a/test/integration/test/integration/default/kernel_parameter_spec.rb b/test/integration/default/kernel_parameter_spec.rb similarity index 100% rename from test/integration/test/integration/default/kernel_parameter_spec.rb rename to test/integration/default/kernel_parameter_spec.rb diff --git a/test/integration/test/integration/default/mount_spec.rb b/test/integration/default/mount_spec.rb similarity index 100% rename from test/integration/test/integration/default/mount_spec.rb rename to test/integration/default/mount_spec.rb diff --git a/test/integration/test/integration/default/os_spec.rb b/test/integration/default/os_spec.rb similarity index 100% rename from test/integration/test/integration/default/os_spec.rb rename to test/integration/default/os_spec.rb diff --git a/test/integration/test/integration/default/package_spec.rb b/test/integration/default/package_spec.rb similarity index 100% rename from test/integration/test/integration/default/package_spec.rb rename to test/integration/default/package_spec.rb diff --git a/test/integration/test/integration/default/port_spec.rb b/test/integration/default/port_spec.rb similarity index 100% rename from test/integration/test/integration/default/port_spec.rb rename to test/integration/default/port_spec.rb diff --git a/test/integration/test/integration/default/postgres_session_spec.rb b/test/integration/default/postgres_session_spec.rb similarity index 100% rename from test/integration/test/integration/default/postgres_session_spec.rb rename to test/integration/default/postgres_session_spec.rb diff --git a/test/integration/test/integration/default/registry_key_spec.rb b/test/integration/default/registry_key_spec.rb similarity index 100% rename from test/integration/test/integration/default/registry_key_spec.rb rename to test/integration/default/registry_key_spec.rb diff --git a/test/integration/test/integration/default/secpol_spec.rb b/test/integration/default/secpol_spec.rb similarity index 100% rename from test/integration/test/integration/default/secpol_spec.rb rename to test/integration/default/secpol_spec.rb diff --git a/test/integration/test/integration/default/service_spec.rb b/test/integration/default/service_spec.rb similarity index 100% rename from test/integration/test/integration/default/service_spec.rb rename to test/integration/default/service_spec.rb diff --git a/test/integration/test/integration/default/user_spec.rb b/test/integration/default/user_spec.rb similarity index 100% rename from test/integration/test/integration/default/user_spec.rb rename to test/integration/default/user_spec.rb diff --git a/test/integration/test/integration/default/yaml_spec.rb b/test/integration/default/yaml_spec.rb similarity index 100% rename from test/integration/test/integration/default/yaml_spec.rb rename to test/integration/default/yaml_spec.rb From 8bc9d8820ae38eeed859ca4e5bcb99f0b27c9436 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Thu, 18 Feb 2016 21:25:36 +0100 Subject: [PATCH 4/6] update Berksfile with new cookbook location --- Berksfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Berksfile b/Berksfile index 135c1479e..ebc38ca4d 100644 --- a/Berksfile +++ b/Berksfile @@ -1,5 +1,5 @@ source 'https://supermarket.chef.io' cookbook 'apt' -cookbook 'os_prepare', path: './cookbooks/os_prepare' +cookbook 'os_prepare', path: './test/cookbooks/os_prepare' cookbook 'runit', github: 'hw-cookbooks/runit' From 7689ea04d73ec05981e697f34bd0af50f0db7ca5 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Fri, 18 Mar 2016 11:39:04 +0100 Subject: [PATCH 5/6] add utf-8 encoding to Berksfile --- Berksfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Berksfile b/Berksfile index ebc38ca4d..2d961e0cc 100644 --- a/Berksfile +++ b/Berksfile @@ -1,3 +1,4 @@ +# encoding: utf-8 source 'https://supermarket.chef.io' cookbook 'apt' From 0b582d2085d88b7831ec0d56ac4aba787d15f8ec Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Fri, 18 Mar 2016 12:28:38 +0100 Subject: [PATCH 6/6] update dependencies for windows --- Gemfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ee8f725a6..95062ec12 100644 --- a/Gemfile +++ b/Gemfile @@ -19,10 +19,9 @@ end group :integration do gem 'berkshelf', '~> 4.0' - gem 'test-kitchen' + gem 'test-kitchen', '~> 1.6' gem 'kitchen-vagrant' - gem 'kitchen-inspec' - gem 'winrm-transport', '~> 1.0' + gem 'kitchen-inspec', '0.12.5' gem 'kitchen-ec2' end