Merge pull request #737 from mkincaid/26confines

Update acceptance tests to use confine instead of skip_test loops
puppetlabs · May 23, 2012 · fe53647 · fe53647
2 parents 4ff46bd + 8e776e3
commit fe53647
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb b/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
@@ -2,11 +2,8 @@
 step "Validate services running agreement ralsh vs. OS service count"
 # This will remotely exec:
 # ticket_4123_should_list_all_running_redhat.sh
+confine :to, :platform => /el-/
 
 hosts.each do |host|
-  if host['platform'].include?('el-')
-    run_script_on(host, File.join(File.dirname(__FILE__), 'ticket_4123_should_list_all_running_redhat.sh'))
-  else
-    skip_test "Test not supported on this plaform" 
-  end
+  run_script_on(host, File.join(File.dirname(__FILE__), 'ticket_4123_should_list_all_running_redhat.sh'))
 end
diff --git a/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb b/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb
@@ -2,11 +2,8 @@
 step "Validate disabled services agreement ralsh vs. OS service count"
 # This will remotely exec:
 # ticket_4124_should_list_all_disabled.sh
+confine :to, :platform => /el-/
 
 hosts.each do |host|
-  unless host['platform'].include?('el-')
-    skip_test "Test not supported on this plaform"
-   else
-    run_script_on(host, File.join(File.dirname(__FILE__), 'ticket_4124_should_list_all_disabled.sh'))
-  end
+  run_script_on(host, File.join(File.dirname(__FILE__), 'ticket_4124_should_list_all_disabled.sh'))
 end