Convert acceptance tests to Litmus

Author: Daniel Carabas

.fixtures.yml

@@ -6,8 +6,11 @@ fixtures:
     powershell: 'puppetlabs-powershell'
     reboot: 'puppetlabs-reboot'
   repositories:
+    facts: 'git://github.com/puppetlabs/puppetlabs-facts.git'
+    puppet_agent: 'git://github.com/puppetlabs/puppetlabs-puppet_agent.git'
+    provision: 'git://github.com/puppetlabs/provision.git'
     yumrepo_core: 
       repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
       puppet_version: ">= 6.0.0"
   symlinks:
-    docker: "#{source_dir}"
+    docker: "#{source_dir}"

Gemfile

@@ -76,4 +76,5 @@ extra_gemfiles.each do |gemfile|
     eval(File.read(gemfile), binding)
   end
 end
+gem "puppet_litmus", git: "https://github.com/puppetlabs/puppet_litmus", require: false,  platforms: [:ruby, :mswin, :mingw, :x64_mingw] if ENV['PUPPET_GEM_VERSION'].nil? or ENV['PUPPET_GEM_VERSION'] !~ %r{ 5}
 # vim: syntax=ruby

provision.yaml

@@ -0,0 +1,13 @@
+---
+  default:
+    provisioner: vagrant
+    images: [ 'ubuntu/xenial64', 'ubuntu/bionic64']
+  centos:
+    provisioner: vagrant
+    images: ['centos/7']
+  debian:
+    provisioner: vagrant
+    images: ['debian/stretch64', 'debian/buster64']
+  release_checks:
+    provisioner: vmpooler
+    images: ['redhat-7-x86_64','centos-7-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'win-2016-x86_64', 'win-2019-x86_64']

spec/acceptance/compose_v3_spec.rb

@@ -1,21 +1,21 @@
 require 'spec_helper_acceptance'
 
-if fact('osfamily') == 'windows'
+if os[:family] == 'windows'
   install_dir = '/cygdrive/c/Program Files/Docker'
   file_extension = '.exe'
   docker_args = 'docker_ee => true'
   tmp_path = 'C:/cygwin64/tmp'
-  test_container = if fact('os.release.major') == '2019'
+  test_container = if os[:release] =~ /2019/
                      'nanoserver'
                    else
                      'nanoserver-sac2016'
                    end
 else
-  docker_args = if fact('os.name') == 'RedHat'
+  docker_args = if os[:name] == 'RedHat'
                   "repo_opt => '--enablerepo=localmirror-extras'"
-                elsif fact('os.name') == 'Centos'
+                elsif os[:name] == 'Centos'
                   "repo_opt => '--enablerepo=localmirror-extras'"
-                elsif fact('os.name') == 'Ubuntu' && fact('os.release.full') == '14.04'
+                elsif os[:name] == 'Ubuntu' && os[:release][:full] == '14.04'
                   "version => '18.06.1~ce~3-0~ubuntu'"
                 else
                   ''
@@ -50,15 +50,15 @@ class { 'docker::compose':
     end
 
     it 'is idempotent' do
-      idempotent_apply(default, install_pp, {})
+      idempotent_apply(install_pp)
     end
 
     it 'has docker compose installed' do
-      shell('docker-compose --help', acceptable_exit_codes: [0])
+      run_shell('docker-compose --help', expect_failures: false)
     end
 
     it 'finds a docker container' do
-      shell('docker inspect web_compose_test_1', acceptable_exit_codes: [0])
+      run_shell('docker inspect web_compose_test_1', expect_failures: false)
     end
   end
 
@@ -75,7 +75,7 @@ class { 'docker::compose':
     end
 
     it "should find container with #{test_container} tag" do
-      shell("docker inspect web1_compose_test_1 | grep #{test_container}", acceptable_exit_codes: [0])
+      run_shell("docker inspect web1_compose_test_1 | grep #{test_container}", acceptable_exit_codes: [0])
     end
   end
 
@@ -101,11 +101,11 @@ class { 'docker::compose':
     end
 
     it 'is idempotent' do
-      idempotent_apply(default, destroy_pp, {})
+      idempotent_apply(destroy_pp)
     end
 
     it 'does not find a docker container' do
-      shell('docker inspect web1_compose_test_1', acceptable_exit_codes: [1])
+      run_shell('docker inspect web1_compose_test_1', expect_failures: true)
     end
   end
 
@@ -120,11 +120,11 @@ class { 'docker::compose':
           version => '#{version}',
         }
       MANIFEST
-      idempotent_apply(default, pp, {})
+      idempotent_apply(pp)
     end
 
     it 'has installed the requested version' do
-      shell('docker-compose --version', acceptable_exit_codes: [0]) do |r|
+      run_shell('docker-compose --version', expect_failures: false) do |r|
         expect(r.stdout).to match(%r{#{version}})
       end
     end
@@ -142,12 +142,12 @@ class { 'docker::compose':
           version => '#{version}',
         }
       MANIFEST
-      idempotent_apply(default, pp, {})
+      idempotent_apply(pp)
     end
 
     it 'has removed the relevant files' do
-      shell("test -e \"#{install_dir}/docker-compose#{file_extension}\"", acceptable_exit_codes: [1])
-      shell("test -e \"#{install_dir}/docker-compose-#{version}#{file_extension}\"", acceptable_exit_codes: [1])
+      run_shell("test -e \"#{install_dir}/docker-compose#{file_extension}\"", expect_failures: true)
+      run_shell("test -e \"#{install_dir}/docker-compose-#{version}#{file_extension}\"", expect_failures: true)
     end
 
     after(:all) do

spec/acceptance/docker_custom_source_spec.rb

@@ -2,7 +2,7 @@
 
 skip = false
 
-if fact('osfamily') == 'windows'
+if os[:family] == 'windows'
   docker_args = 'docker_ee => true, docker_ee_source_location => "https://download.docker.com/components/engine/windows-server/17.06/docker-17.06.2-ee-14.zip"'
   default_image = 'winamd64/hello-seattle'
   # The default args are set because:
@@ -12,7 +12,7 @@
   default_run_command = 'ping 127.0.0.1 -t'
   docker_command = '"/cygdrive/c/Program Files/Docker/docker"'
   skip = false
-elsif fact('os.name') == 'Ubuntu' && fact('os.release.full') == '14.04'
+elsif os[:name] == 'Ubuntu' && os[:release][:full] == '14.04'
   docker_args = "version => '18.06.1~ce~3-0~ubuntu'"
   skip = true
 else
@@ -33,23 +33,24 @@ class { 'docker': #{docker_args} }
     end
 
     it 'runs idempotently' do
+      require 'pry'; binding.pry
       apply_manifest(pp, catch_changes: true) unless fact('selinux') == 'true'
     end
 
     it 'is start a docker process' do
       if fact('osfamily') == 'windows'
-        shell('powershell Get-Process -Name dockerd') do |r|
+        run_shell('powershell Get-Process -Name dockerd') do |r|
           expect(r.stdout).to match(%r{ProcessName})
         end
       else
-        shell('ps aux | grep docker') do |r|
+        run_shell('ps aux | grep docker') do |r|
           expect(r.stdout).to match %r{dockerd -H unix:\/\/\/var\/run\/docker.sock}
         end
       end
     end
 
     it 'installs a working docker client' do
-      shell("#{docker_command} ps", acceptable_exit_codes: [0])
+      run_shell("#{docker_command} ps", expect_failures: false)
     end
 
     it 'stops a running container and remove container' do
@@ -88,19 +89,19 @@ class { 'docker': #{docker_args} }
       # A sleep to give docker time to execute properly
       sleep 15
 
-      shell("#{docker_command} ps", acceptable_exit_codes: [0])
+      run_shell("#{docker_command} ps", expect_failures: false)
 
       apply_manifest(pp2, catch_failures: true)
       apply_manifest(pp2, catch_changes: true) unless fact('selinux') == 'true'
 
       # A sleep to give docker time to execute properly
       sleep 15
 
-      shell("#{docker_command} inspect container-3-6", acceptable_exit_codes: [1])
-      if fact('osfamily') == 'windows'
-        shell('test -f /cygdrive/c/Users/Administrator/AppData/Local/Temp/container-3-6.service', acceptable_exit_codes: [1])
+      run_shell("#{docker_command} inspect container-3-6", expect_failures: true)
+      if os[:family] == 'windows'
+        run_shell('test -f /cygdrive/c/Users/Administrator/AppData/Local/Temp/container-3-6.service', expect_failures: true)
       else
-        shell('test -f /etc/systemd/system/container-3-6.service', acceptable_exit_codes: [1])
+        run_shell('test -f /etc/systemd/system/container-3-6.service', expect_failures: true)
       end
     end
   end