Merge pull request #158 from jpogran/MODULES-6744-add-testmode-switcher

(MODULES-6744) Add testmode switcher
puppetlabs · Mar 15, 2018 · ef2f83e · ef2f83e
2 parents 4edaf0e + 30c34ca
commit ef2f83e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 19 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -1,6 +1,12 @@
 ---
 Rakefile:
   unmanaged: true
+Gemfile:
+  optional:
+    ':system_tests':
+      - gem: beaker-testmode_switcher
+        version: '~> 0.4'
+      - gem: master_manipulator
 spec/spec_helper.rb:
   unmanaged: true
 appveyor.yml:

diff --git a/Gemfile b/Gemfile
@@ -58,7 +58,9 @@ group :system_tests do
   gem "beaker-pe",                                                               :require => false
   gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])                
   gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
-  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
+  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
+  gem "beaker-testmode_switcher", '~> 0.4',                                      :require => false
+  gem 'master_manipulator',                                                      :require => false        
   gem "puppet-blacksmith", '~> 3.4',                                             :require => false
 end
 

diff --git a/spec/acceptance/should_create_key_spec.rb b/spec/acceptance/should_create_key_spec.rb
@@ -102,11 +102,12 @@
     ]
 
     windows_agents.each do |agent|
-      keys_created = keys_created_native + (is_x64(agent) ? keys_created_wow : [])
-      values_purged = values_purged_native + (is_x64(agent) ? values_purged_wow : [])
+      agent_is_x64 = is_x64(agent)
+      keys_created = keys_created_native + (agent_is_x64 ? keys_created_wow : [])
+      values_purged = values_purged_native + (agent_is_x64 ? values_purged_wow : [])
 
       it 'Registry - Phase 1.a - Create some keys' do
-        apply_manifest_on(agent, phase1, get_apply_opts) do
+        execute_manifest_on(agent, phase1, get_apply_opts) do
           keys_created.each do |key_re|
             assert_match(key_re, @result.stdout, "Expected #{key_re.inspect} to match the output. (First Run)")
           end
@@ -116,7 +117,7 @@
 
       it 'Registry - Phase 1.b - Make sure Puppet is idempotent' do
         # Do a second run and make sure the key isn't created a second time.
-         apply_manifest_on(agent, phase1, get_apply_opts) do
+         execute_manifest_on(agent, phase1, get_apply_opts) do
           keys_created.each do |key_re|
             assert_no_match(key_re, @result.stdout,
                             "Expected #{key_re.inspect} NOT to match the output. (First Run)")
@@ -126,7 +127,7 @@
       end
 
       it 'Registry - Phase 2 - Make sure purge_values works' do
-        apply_manifest_on(agent, phase2, get_apply_opts({'FACTER_FACT_PHASE' => '2'})) do
+        execute_manifest_on(agent, phase2, get_apply_opts({'FACTER_FACT_PHASE' => '2'})) do
           values_purged.each do |val_re|
             assert_match(val_re, @result.stdout, "Expected output to contain #{val_re.inspect}.")
           end
@@ -135,11 +136,10 @@
       end
 
       it 'Registry - Phase 3 - Should clean up' do
-        apply_manifest_on(agent, phase3, get_apply_opts({'FACTER_FACT_PHASE' => '3'})) do
+        execute_manifest_on(agent, phase3, get_apply_opts({'FACTER_FACT_PHASE' => '3'})) do
           assert_no_match(/err:/, @result.stdout, 'Expected no error messages.')
         end
       end
     end
   end
 end
-
diff --git a/spec/acceptance/should_have_defined_type_spec.rb b/spec/acceptance/should_have_defined_type_spec.rb
@@ -51,7 +51,7 @@
     ]
     windows_agents.each do |agent|
       it 'Phase 1.a - Create some values' do
-        apply_manifest_on agent, manifest, get_apply_opts({'FACTER_FACT_PHASE' => '1'}) do
+        execute_manifest_on agent, manifest, get_apply_opts({'FACTER_FACT_PHASE' => '1'}) do
           phase1_resources_created.each do |val_re|
             assert_match(val_re, @result.stdout, "Expected output to contain #{val_re.inspect}.")
           end
@@ -60,7 +60,7 @@
       end
 
       it 'Phase 1.b - Make sure Puppet is idempotent' do
-        apply_manifest_on agent, manifest, get_apply_opts({'FACTER_FACT_PHASE' => '1'}) do
+        execute_manifest_on agent, manifest, get_apply_opts({'FACTER_FACT_PHASE' => '1'}) do
           phase1_resources_created.each do |val_re|
             assert_no_match(val_re, @result.stdout, "Expected output not to contain #{val_re.inspect}.")
           end
@@ -69,7 +69,7 @@
       end
 
       it 'Phase 2.a - Change some values' do
-        apply_manifest_on agent, manifest, get_apply_opts({'FACTER_FACT_PHASE' => '2'}) do
+        execute_manifest_on agent, manifest, get_apply_opts({'FACTER_FACT_PHASE' => '2'}) do
           phase2_resources_changed.each do |val_re|
             assert_match(val_re, @result.stdout, "Expected output to contain #{val_re.inspect}.")
           end
@@ -78,7 +78,7 @@
       end
 
       it 'Phase 2.b - Make sure Puppet is idempotent' do
-        apply_manifest_on agent, manifest, get_apply_opts({'FACTER_FACT_PHASE' => '2'}) do
+        execute_manifest_on agent, manifest, get_apply_opts({'FACTER_FACT_PHASE' => '2'}) do
           (phase1_resources_created + phase2_resources_changed).each do |val_re|
             assert_no_match(val_re, @result.stdout, "Expected output not to contain #{val_re.inspect}.")
           end
@@ -88,4 +88,3 @@
     end
   end
 end
-
diff --git a/spec/acceptance/should_manage_values_spec.rb b/spec/acceptance/should_manage_values_spec.rb
@@ -269,7 +269,7 @@ def getManifest(keypath, vendor_path, phase)
 
 
       it 'Registry Values - Phase 1.a - Create some values' do
-        apply_manifest_on agent, getManifest(keypath, vendor_path, '1'), get_apply_opts do
+        execute_manifest_on agent, getManifest(keypath, vendor_path, '1'), get_apply_opts do
           assert_no_match(/err:/, @result.stdout, 'Expected no error messages.')
           phase1_resources_created.each do |val_re|
             assert_match(val_re, @result.stdout, "Expected output to contain #{val_re.inspect}.")
@@ -278,7 +278,7 @@ def getManifest(keypath, vendor_path, phase)
       end
 
       it 'Registry Values - Phase 1.b - Make sure Puppet is idempotent' do
-        apply_manifest_on agent, getManifest(keypath, vendor_path, '1'), get_apply_opts do
+        execute_manifest_on agent, getManifest(keypath, vendor_path, '1'), get_apply_opts do
           phase1_resources_created.each do |val_re|
             assert_no_match(val_re, @result.stdout, "Expected output to contain #{val_re.inspect}.")
           end
@@ -287,7 +287,7 @@ def getManifest(keypath, vendor_path, phase)
       end
 
       it 'Registry Values - Phase 2.a - Change some values' do
-        apply_manifest_on agent, getManifest(keypath, vendor_path, '2'), get_apply_opts do
+        execute_manifest_on agent, getManifest(keypath, vendor_path, '2'), get_apply_opts do
           assert_no_match(/err:/, @result.stdout, 'Expected no error messages.')
           phase2_resources_changed.each do |val_re|
             assert_match(val_re, @result.stdout, "Expected output to contain #{val_re.inspect}.")
@@ -296,7 +296,7 @@ def getManifest(keypath, vendor_path, phase)
       end
 
       it 'Registry Values - Phase 2.b - Make sure Puppet is idempotent' do
-        apply_manifest_on agent, getManifest(keypath, vendor_path, '2'), get_apply_opts do
+        execute_manifest_on agent, getManifest(keypath, vendor_path, '2'), get_apply_opts do
           phase2_resources_changed.each do |val_re|
             assert_no_match(val_re, @result.stdout, "Expected output to contain #{val_re.inspect}.")
           end
@@ -321,4 +321,3 @@ def getManifest(keypath, vendor_path, phase)
     end
   end
 end
-
diff --git a/spec/acceptance/should_tolerate_mixed_case_spec.rb b/spec/acceptance/should_tolerate_mixed_case_spec.rb
@@ -144,7 +144,7 @@
       end
 
       it "Registry Tolerate Mixed Case Values - Phase 1.a - Create some values" do
-        apply_manifest_on agent, phase1, get_apply_opts({'FACTER_FACT_PHASE' => '1'}) do |result|
+        execute_manifest_on agent, phase1, get_apply_opts({'FACTER_FACT_PHASE' => '1'}) do |result|
           phase1_resources_created.each do |val_re|
             assert_match(val_re, result.stdout, "Expected output to contain #{val_re.inspect}.")
           end

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -1,6 +1,8 @@
 require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'
+require 'beaker/testmode_switcher'
+require 'beaker/testmode_switcher/dsl'
 
 run_puppet_install_helper