Update acceptance tests

Author: Daniel Carabas

Diff for: provision.yaml

@@ -8,6 +8,9 @@
   debian:
     provisioner: vagrant
     images: ['debian/stretch64', 'debian/buster64']
+  win:
+    provisioner: vagrant
+    images: ['gusztavvargadr/windows-server']
   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']

Diff for: spec/acceptance/compose_v3_spec.rb

@@ -5,7 +5,7 @@
   file_extension = '.exe'
   docker_args = 'docker_ee => true'
   tmp_path = 'C:/cygwin64/tmp'
-  test_container = if os[:release] =~ /2019/
+  test_container = if os[:release] =~ %r{2019}
                      'nanoserver'
                    else
                      'nanoserver-sac2016'
@@ -39,7 +39,7 @@ class { 'docker::compose':
     end
   end
 
-  context 'Creating compose v3 projects' do
+  context 'Creating compose v3 projects', win_broken: true do
     let(:install_pp) do
       <<-MANIFEST
         docker_compose { 'web':
@@ -62,7 +62,7 @@ class { 'docker::compose':
     end
   end
 
-  context 'creating compose projects with multi compose files' do
+  context 'creating compose projects with multi compose files', win_broken: true do
     before(:all) do
       install_pp = <<-MANIFEST
         docker_compose { 'web1':
@@ -79,7 +79,7 @@ class { 'docker::compose':
     end
   end
 
-  context 'Destroying project with multiple compose files' do
+  context 'Destroying project with multiple compose files', win_broken: true do
     let(:destroy_pp) do
       <<-MANIFEST
         docker_compose { 'web1':

Diff for: spec/acceptance/docker_custom_source_spec.rb

@@ -33,12 +33,11 @@ class { 'docker': #{docker_args} }
     end
 
     it 'runs idempotently' do
-      require 'pry'; binding.pry
-      apply_manifest(pp, catch_changes: true) unless fact('selinux') == 'true'
+      apply_manifest(pp, catch_changes: true) unless selinux == 'true'
     end
 
     it 'is start a docker process' do
-      if fact('osfamily') == 'windows'
+      if os[:family] == 'windows'
         run_shell('powershell Get-Process -Name dockerd') do |r|
           expect(r.stdout).to match(%r{ProcessName})
         end
@@ -84,15 +83,15 @@ class { 'docker': #{docker_args} }
     EOS
 
       apply_manifest(pp, catch_failures: true)
-      apply_manifest(pp, catch_changes: true) unless fact('selinux') == 'true'
+      apply_manifest(pp, catch_changes: true) unless selinux == 'true'
 
       # A sleep to give docker time to execute properly
       sleep 15
 
       run_shell("#{docker_command} ps", expect_failures: false)
 
       apply_manifest(pp2, catch_failures: true)
-      apply_manifest(pp2, catch_changes: true) unless fact('selinux') == 'true'
+      apply_manifest(pp2, catch_changes: true) unless selinux == 'true'
 
       # A sleep to give docker time to execute properly
       sleep 15

Diff for: spec/acceptance/docker_full_spec.rb

@@ -53,7 +53,7 @@
 end
 
 describe 'the Puppet Docker module' do
-  context 'clean up before each test' do
+  context 'clean up before each test', win_broken: true do
     before(:each) do
       retry_on_error_matching(60, 5, %r{connection failure running}) do
         # Stop all container using systemd
@@ -74,7 +74,7 @@
     end
 
     describe 'docker class' do
-      context 'without any parameters' do
+      context 'without any parameters', win_brokn: true do
         let(:pp) { "class { 'docker': #{docker_args} }" }
 
         it 'runs successfully' do
@@ -673,7 +673,7 @@ class { 'docker': #{docker_args} }
         end
       end
 
-      it 'stops a running container' do
+      it 'stops a running container', win_broken: true do
         pp = <<-EOS
           class { 'docker': #{docker_args} }
 
@@ -835,7 +835,7 @@ class { 'docker': #{docker_args} }
     end
   end
 
-  describe 'docker::exec'  do
+  describe 'docker::exec', win_broken: true do
     it 'runs a command inside an already running container' do
       pp = <<-EOS
           class { 'docker': #{docker_args} }
@@ -894,7 +894,7 @@ class { 'docker': #{docker_args} }
       apply_manifest(pp_delete, catch_failures: true)
     end
 
-    it 'onlies run if notified when refreshonly is true' do
+    it 'onlies run if notified when refreshonly is true', win_broken: true do
       container_name = 'container_4_2'
       pp = <<-EOS
           class { 'docker': #{docker_args} }

Diff for: spec/acceptance/docker_spec.rb

@@ -7,7 +7,7 @@
 if os[:family] == 'windows'
   result = run_shell("ipconfig | findstr /i 'ipv4'")
   raise 'Could not retrieve ip address for Windows box' if result.exit_code != 0
-  ip = result.stdout.split("\n")[0].split(':')[1].strip()
+  ip = result.stdout.split("\n")[0].split(':')[1].strip
   @windows_ip = ip
   docker_arg = "docker_ee => true, extra_parameters => '\"insecure-registries\": [ \"#{@windows_ip}:5000\" ]'"
   docker_registry_image = 'stefanscherer/registry-windows'
@@ -194,7 +194,7 @@ class { 'docker': #{docker_arg}}
       sleep 10
     end
 
-    it 'is able to login to the registry', retry: 3, retry_wait: 10 do
+    it 'is able to login to the registry', retry: 3, retry_wait: 10, win_broken: true do
       pp = <<-MANIFEST
         docker::registry { '#{registry_address}':
           username => 'username',
@@ -206,7 +206,7 @@ class { 'docker': #{docker_arg}}
       run_shell("test -e \"#{root_dir}/registry-auth-puppet_receipt_#{server_strip}_root\"", expect_failures: false)
     end
 
-    it 'is able to logout from the registry' do
+    it 'is able to logout from the registry', win_broken: true do
       pp = <<-MANIFEST
         docker::registry { '#{registry_address}':
           ensure=> absent,

Diff for: spec/acceptance/stack_spec.rb

@@ -2,20 +2,19 @@
 
 if os[:family] == 'windows'
   docker_args = 'docker_ee => true'
-  tmp_path = 'C:/cygwin64/tmp'
+  tmp_path = 'C:\\tmp\\'
   wait_for_container_seconds = 120
-
 else
-  docker_args = if os[:name] == 'Ubuntu' && os[:release][:full] == '14.04'
+  docker_args = if os[:name] == 'ubuntu' && os[:release][:full] == '14.04'
                   "version => '18.06.1~ce~3-0~ubuntu'"
                 else
                   ''
                 end
-  tmp_path = '/tmp'
+  tmp_path = '/tmp/'
   wait_for_container_seconds = 10
 end
 
-describe 'docker stack' do
+describe 'docker stack', win_broken: true do
   before(:all) do
     retry_on_error_matching(60, 5, %r{connection failure running}) do
       install_pp = <<-MANIFEST
@@ -36,7 +35,7 @@ class { 'docker': #{docker_args} }
     let(:install_pp) do
       <<-MANIFEST
         docker_stack { 'web':
-          compose_files => ['#{tmp_path}/docker-stack.yml'],
+          compose_files => ['#{tmp_path}docker-stack.yml'],
           ensure        => present,
         }
       MANIFEST
@@ -66,7 +65,7 @@ class { 'docker': #{docker_args} }
     let(:install) do
       <<-MANIFEST
         docker_stack { 'web':
-          compose_files => ['#{tmp_path}/docker-stack.yml'],
+          compose_files => ['#{tmp_path}docker-stack.yml'],
           ensure        => present,
         }
       MANIFEST
@@ -75,7 +74,7 @@ class { 'docker': #{docker_args} }
     let(:destroy) do
       <<-MANIFEST
         docker_stack { 'web':
-          compose_files => ['#{tmp_path}/docker-stack.yml'],
+          compose_files => ['#{tmp_path}docker-stack.yml'],
           ensure        => absent,
         }
       MANIFEST
@@ -103,7 +102,7 @@ class { 'docker': #{docker_args} }
     before(:all) do
       install_pp = <<-MANIFEST
         docker_stack { 'web':
-          compose_files => ['#{tmp_path}/docker-stack.yml', '#{tmp_path}/docker-stack-override.yml'],
+          compose_files => ['#{tmp_path}docker-stack.yml', '#{tmp_path}docker-stack-override.yml'],
           ensure        => present,
         }
       MANIFEST
@@ -121,7 +120,7 @@ class { 'docker': #{docker_args} }
     let(:destroy_pp) do
       <<-MANIFEST
         docker_stack { 'web':
-          compose_files => ['#{tmp_path}/docker-stack.yml', '#{tmp_path}/docker-stack-override.yml'],
+          compose_files => ['#{tmp_path}docker-stack.yml', '#{tmp_path}docker-stack-override.yml'],
           ensure        => absent,
         }
       MANIFEST
@@ -130,15 +129,15 @@ class { 'docker': #{docker_args} }
     before(:all) do
       install_pp = <<-MANIFEST
         docker_stack { 'web':
-          compose_files => ['#{tmp_path}/docker-stack.yml', '#{tmp_path}/docker-stack-override.yml'],
+          compose_files => ['#{tmp_path}docker-stack.yml', '#{tmp_path}docker-stack-override.yml'],
           ensure        => present,
         }
       MANIFEST
       apply_manifest(install_pp, catch_failures: true)
 
       destroy_pp = <<-MANIFEST
         docker_stack { 'web':
-          compose_files => ['#{tmp_path}/docker-stack.yml', '#{tmp_path}/docker-stack-override.yml'],
+          compose_files => ['#{tmp_path}docker-stack.yml', '#{tmp_path}docker-stack-override.yml'],
           ensure        => absent,
         }
       MANIFEST

Diff for: spec/spec_helper_acceptance_local.rb

@@ -38,9 +38,6 @@ def create_remote_file(name, full_name, file_content)
   # Add exclusive filter for Windows untill all the windows functionality is implemented
   c.filter_run_excluding win_broken: true
 
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
   # Readable test descriptions
   c.formatter = :documentation
 
@@ -58,7 +55,7 @@ def create_remote_file(name, full_name, file_content)
       run_shell('mv /etc/yum.repos.d/redhat.repo /etc/yum.repos.d/internal-mirror.repo', expect_failures: true)
       run_shell('rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm', expect_failures: true)
       run_shell('yum update -y -q')
-     # run_shell('yum upgrade -y')
+      # run_shell('yum upgrade -y')
     end
     if os[:family] == 'debian' || os[:family] == 'ubuntu'
       run_shell('apt-get update -y')
@@ -184,7 +181,7 @@ def create_remote_file(name, full_name, file_content)
     retry_on_error_matching(60, 5, %r{connection failure running}) do
       @windows_ip = ip
     end
-    apply_manifest("class { 'docker': docker_ee => true, extra_parameters => '\"insecure-registries\": [ \"#{@windows_ip}:5000\" ]' }")
+    apply_manifest("class { 'docker': docker_ee => true, extra_parameters => '\"insecure-registries\": [ \"#{@windows_ip}:5000\" ]' }", catch_failures: true)
     docker_path = '/cygdrive/c/Program Files/Docker'
     run_shell("set PATH \"%PATH%;C:\\Users\\Administrator\\AppData\\Local\\Temp;#{docker_path}\"")
     puts 'Waiting for box to come online'