Get tests working on master

Gemfile

@@ -7,7 +7,7 @@ group :test, :integration do
 end
 
 group :test do
-  gem 'chefspec', '~> 4.0.0'
+  gem 'chefspec', '~> 4.2.0'
   # elecksee is lxc dependency
   gem 'elecksee', '~> 1.0.20'
   gem 'foodcritic', '~> 3.0.3'

libraries/matchers.rb

@@ -1,8 +1,15 @@
 if defined?(ChefSpec)
   # Docker matchers
-  ChefSpec::Runner.define_runner_method(:docker_container)
-  ChefSpec::Runner.define_runner_method(:docker_image)
-  ChefSpec::Runner.define_runner_method(:docker_registry)
+  chefspec_version = Gem.loaded_specs['chefspec'].version
+  if chefspec_version < Gem::Version.new('4.1.0')
+    ChefSpec::Runner.define_runner_method(:docker_container)
+    ChefSpec::Runner.define_runner_method(:docker_image)
+    ChefSpec::Runner.define_runner_method(:docker_registry)
+  else
+    ChefSpec.define_matcher(:docker_container)
+    ChefSpec.define_matcher(:docker_image)
+    ChefSpec.define_matcher(:docker_registry)
+  end
 
   # Docker registry
   def login_docker_registry(resource_name)

spec/aufs_spec.rb

@@ -18,7 +18,7 @@
   end
 
   let(:chef_run) do
-    ChefSpec::Runner.new.converge(described_recipe)
+    ChefSpec::SoloRunner.new.converge(described_recipe)
   end
 
   it 'includes the aufs recipe' do

spec/binary_spec.rb

@@ -3,7 +3,7 @@
 describe 'docker::binary' do
   context 'by default' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04') do |node|
+      ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '12.04') do |node|
         node.automatic['kernel']['release'] = '3.8.0'
       end.converge(described_recipe)
     end
@@ -15,7 +15,7 @@
 
   context 'when install_dir is set' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04') do |node|
+      ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '12.04') do |node|
         node.normal['docker']['install_dir'] = '/tmp'
         node.automatic['kernel']['release'] = '3.8.0'
       end.converge(described_recipe)
@@ -28,7 +28,7 @@
 
   context 'when install_type is binary' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04') do |node|
+      ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '12.04') do |node|
         node.normal['docker']['install_type'] = 'binary'
         node.automatic['kernel']['release'] = '3.8.0'
       end.converge(described_recipe)

spec/cgroups_spec.rb

@@ -3,7 +3,7 @@
 describe 'docker::cgroups' do
   context 'when running on oracle 6.5' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'oracle', version: '6.5').converge(described_recipe)
+      ChefSpec::SoloRunner.new(platform: 'oracle', version: '6.5').converge(described_recipe)
     end
 
     it 'installs the libcgroup package' do
@@ -18,7 +18,7 @@
 
   context 'when running on any ubuntu platform' do
     let(:chef_run) do
-      ChefSpec::Runner.new.converge(described_recipe)
+      ChefSpec::SoloRunner.new.converge(described_recipe)
     end
 
     it 'should install the cgroup-bin package' do
@@ -28,7 +28,7 @@
 
   context 'when running on ubuntu 12.04' do
     let(:chef_run) do
-      ChefSpec::Runner.new.converge(described_recipe)
+      ChefSpec::SoloRunner.new.converge(described_recipe)
     end
 
     it 'should start the cgconfig service' do
@@ -42,7 +42,7 @@
 
   context 'when running on other ubuntu platforms' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'ubuntu', version: '14.04').converge(described_recipe)
+      ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '14.04').converge(described_recipe)
     end
 
     it 'should start the cgroup-lite service' do

spec/default_spec.rb

@@ -24,7 +24,7 @@
 
   context 'when running on ubuntu 12.04' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04') do |node|
+      ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '12.04') do |node|
         node.set['docker']['alert_on_error_action'] = :warn
       end.converge(described_recipe)
     end
@@ -46,7 +46,7 @@
 
   context 'when running on debian 7.4' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'debian', version: '7.4') do |node|
+      ChefSpec::SoloRunner.new(platform: 'debian', version: '7.4') do |node|
         node.set['docker']['alert_on_error_action'] = :warn
       end.converge(described_recipe)
     end
@@ -74,7 +74,7 @@
 
   context 'when exec_driver is lxc' do
     let(:chef_run) do
-      ChefSpec::Runner.new do |node|
+      ChefSpec::SoloRunner.new do |node|
         node.set['docker']['alert_on_error_action'] = :warn
         node.set['docker']['exec_driver'] = 'lxc'
       end.converge(described_recipe)
@@ -91,7 +91,7 @@
 
   context 'when install_type is binary' do
     let(:chef_run) do
-      ChefSpec::Runner.new do |node|
+      ChefSpec::SoloRunner.new do |node|
         node.set['docker']['alert_on_error_action'] = :warn
         node.set['docker']['install_type'] = 'binary'
       end.converge(described_recipe)
@@ -112,7 +112,7 @@
     it 'installs the XZ Utilities package' do
       expect(chef_run).to install_package('xz-utils')
 
-      rhel_run = ChefSpec::Runner.new(platform: 'redhat', version: '6.5') do |node|
+      rhel_run = ChefSpec::SoloRunner.new(platform: 'redhat', version: '6.5') do |node|
         node.set['docker']['alert_on_error_action'] = :warn
         node.set['docker']['install_type'] = 'binary'
         node.automatic['kernel']['release'] = '3.8.0'
@@ -133,7 +133,7 @@
   context 'when running on ubuntu < 13.10' do
     context 'and install_type is binary and storage_driver is aufs' do
       let(:chef_run) do
-        ChefSpec::Runner.new do |node|
+        ChefSpec::SoloRunner.new do |node|
           node.set['docker']['alert_on_error_action'] = :warn
           node.set['docker']['install_type'] = 'binary'
           node.set['docker']['storage_driver'] = 'aufs'
@@ -148,7 +148,7 @@
 
   context 'when running on ubuntu > 13.10' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'ubuntu', version: '14.04') do |node|
+      ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '14.04') do |node|
         node.set['docker']['alert_on_error_action'] = :warn
         node.set['docker']['install_type'] = 'binary'
         node.set['docker']['storage_driver'] = 'aufs'
@@ -162,7 +162,7 @@
 
   context 'when install_type is source' do
     let(:chef_run) do
-      ChefSpec::Runner.new do |node|
+      ChefSpec::SoloRunner.new do |node|
         node.set['docker']['alert_on_error_action'] = :warn
         node.set['docker']['install_type'] = 'source'
       end.converge(described_recipe)
@@ -183,7 +183,7 @@
 
   context 'when the install_type is package' do
     let(:chef_run) do
-      ChefSpec::Runner.new do |node|
+      ChefSpec::SoloRunner.new do |node|
         node.set['docker']['alert_on_error_action'] = :warn
       end.converge(described_recipe)
     end
@@ -196,7 +196,7 @@
   %w( runit systemd sysv ).each do |init|
     context "when init_type is #{init}" do
       let(:chef_run) do
-        ChefSpec::Runner.new do |node|
+        ChefSpec::SoloRunner.new do |node|
           node.set['docker']['graph'] = '/var/lib/docker'
           node.set['docker']['alert_on_error_action'] = :warn
           node.set['docker']['init_type'] = init

spec/dep_check_spec.rb

@@ -3,7 +3,7 @@
 describe 'docker::dep_check' do
   context 'when running on darwin' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'mac_os_x', version: '10.9.2').converge(described_recipe)
+      ChefSpec::SoloRunner.new(platform: 'mac_os_x', version: '10.9.2').converge(described_recipe)
     end
 
     before do
@@ -22,7 +22,7 @@
 
   context 'when running debian' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04') do |node|
+      ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '12.04') do |node|
         node.automatic['kernel']['release'] = '3.2.0-26-generic'
       end.converge(described_recipe)
     end
@@ -35,7 +35,7 @@
   context 'when running on redhat' do
     context 'with 32bit archtiecture' do
       let(:chef_run) do
-        ChefSpec::Runner.new(platform: 'redhat', version: '6.5') do |node|
+        ChefSpec::SoloRunner.new(platform: 'redhat', version: '6.5') do |node|
           node.automatic['kernel']['machine'] = 'i386'
         end.converge(described_recipe)
       end
@@ -47,7 +47,7 @@
 
     context 'with platform < 6.5' do
       let(:chef_run) do
-        ChefSpec::Runner.new(platform: 'redhat', version: '5.8').converge(described_recipe)
+        ChefSpec::SoloRunner.new(platform: 'redhat', version: '5.8').converge(described_recipe)
       end
 
       it 'should fail' do
@@ -57,7 +57,7 @@
 
     context 'installing as binary on kernel < 3.8' do
       let(:chef_run) do
-        ChefSpec::Runner.new(platform: 'redhat', version: '6.5') do |node|
+        ChefSpec::SoloRunner.new(platform: 'redhat', version: '6.5') do |node|
           node.set['docker']['install_type'] = 'binary'
           node.automatic['kernel']['release'] = '2.6.32-431'
         end.converge(described_recipe)
@@ -70,7 +70,7 @@
 
     context 'with kernel version < 2.6.32' do
       let(:chef_run) do
-        ChefSpec::Runner.new(platform: 'redhat', version: '6.5') do |node|
+        ChefSpec::SoloRunner.new(platform: 'redhat', version: '6.5') do |node|
           node.automatic['kernel']['release'] = '2.6.18-308.1.1.el5'
         end.converge(described_recipe)
       end
@@ -84,7 +84,7 @@
   context 'when running on suse' do
     context 'on 32bit arch' do
       let(:chef_run) do
-        ChefSpec::Runner.new(platform: 'opensuse', version: '12.3') do |node|
+        ChefSpec::SoloRunner.new(platform: 'opensuse', version: '12.3') do |node|
           node.automatic['kernel']['machine'] = 'i386'
         end.converge(described_recipe)
       end

spec/devicemapper_spec.rb

@@ -2,7 +2,7 @@
 
 describe 'docker::devicemapper' do
   let(:chef_run) do
-    ChefSpec::Runner.new.converge(described_recipe)
+    ChefSpec::SoloRunner.new.converge(described_recipe)
   end
 
   it 'includes the device-mapper recipe' do

spec/group_spec.rb

@@ -2,7 +2,7 @@
 
 describe 'docker::group' do
   let(:chef_run) do
-    ChefSpec::Runner.new.converge(described_recipe)
+    ChefSpec::SoloRunner.new.converge(described_recipe)
   end
 
   it 'creates the docker group' do
@@ -15,7 +15,7 @@
 
   context 'when group is set' do
     let(:chef_run) do
-      runner = ChefSpec::Runner.new
+      runner = ChefSpec::SoloRunner.new
       runner.node.set['docker']['group'] = 'vagrant'
       runner.converge(described_recipe)
     end
@@ -31,7 +31,7 @@
 
   context 'when group_members is set' do
     let(:chef_run) do
-      runner = ChefSpec::Runner.new
+      runner = ChefSpec::SoloRunner.new
       runner.node.set['docker']['group_members'] = ['vagrant']
       runner.converge(described_recipe)
     end

spec/lxc_spec.rb

@@ -10,22 +10,22 @@
   context 'when running on debian' do
     it_behaves_like 'a non-ubuntu platform' do
       let(:chef_run) do
-        ChefSpec::Runner.new(platform: 'debian', version: '7.4').converge(described_recipe)
+        ChefSpec::SoloRunner.new(platform: 'debian', version: '7.4').converge(described_recipe)
       end
     end
   end
 
   context 'when running on oracle' do
     it_behaves_like 'a non-ubuntu platform' do
       let(:chef_run) do
-        ChefSpec::Runner.new(platform: 'oracle', version: '6.5').converge(described_recipe)
+        ChefSpec::SoloRunner.new(platform: 'oracle', version: '6.5').converge(described_recipe)
       end
     end
   end
 
   context 'when running on ubuntu' do
     let(:chef_run) do
-      ChefSpec::Runner.new.converge(described_recipe)
+      ChefSpec::SoloRunner.new.converge(described_recipe)
     end
 
     it 'includes the lxc recipe' do

spec/package_spec.rb

@@ -35,26 +35,26 @@
   context 'when running on centos' do
     it_behaves_like 'a yum-based system' do
       let(:chef_run) do
-        ChefSpec::Runner.new(platform: 'centos', version: '6.5').converge(described_recipe)
+        ChefSpec::SoloRunner.new(platform: 'centos', version: '6.5').converge(described_recipe)
       end
     end
   end
 
   context 'when running on redhat' do
     it_behaves_like 'a yum-based system' do
       let(:chef_run) do
-        ChefSpec::Runner.new(platform: 'redhat', version: '6.5').converge(described_recipe)
+        ChefSpec::SoloRunner.new(platform: 'redhat', version: '6.5').converge(described_recipe)
       end
     end
   end
 
   context 'when running on debian' do
     it_behaves_like 'an apt-based system' do
       let(:chef_run) do
-        ChefSpec::Runner.new(platform: 'debian', version: '7.4').converge(described_recipe)
+        ChefSpec::SoloRunner.new(platform: 'debian', version: '7.4').converge(described_recipe)
       end
       let(:chef_run2) do
-        runner = ChefSpec::Runner.new(platform: 'debian', version: '7.4')
+        runner = ChefSpec::SoloRunner.new(platform: 'debian', version: '7.4')
         runner.node.set['docker']['version'] = '0.9.1'
         runner.converge(described_recipe)
       end
@@ -64,10 +64,10 @@
   context 'when running on ubuntu' do
     it_behaves_like 'an apt-based system' do
       let(:chef_run) do
-        ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04').converge(described_recipe)
+        ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '12.04').converge(described_recipe)
       end
       let(:chef_run2) do
-        runner = ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04')
+        runner = ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '12.04')
         runner.node.set['docker']['version'] = '0.9.1'
         runner.converge(described_recipe)
       end
@@ -76,7 +76,7 @@
 
   context 'when running on fedora' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'fedora', version: '19').converge(described_recipe)
+      ChefSpec::SoloRunner.new(platform: 'fedora', version: '19').converge(described_recipe)
     end
 
     it 'should install the docker-io package' do
@@ -86,7 +86,7 @@
 
   context 'when running on mac_os_x' do
     let(:chef_run) do
-      ChefSpec::Runner.new(platform: 'mac_os_x', version: '10.9.2').converge(described_recipe)
+      ChefSpec::SoloRunner.new(platform: 'mac_os_x', version: '10.9.2').converge(described_recipe)
     end
 
     it 'should tap the homebrew/binary cask' do