Please review pull request #737: Update acceptance tests to use confine instead of skip_test loops opened by (mkincaid)
Description:
2.6.x specific tests only. Counterpart to #734 and #736 for the 2.6.x branch.
- Opened: Thu May 03 01:24:00 UTC 2012
- Based on: puppetlabs:2.6.x (d174a9f28a66819bedfead803765d22e2c04411a)
- Requested merge: mkincaid:26confines (8e776e3cd1fde5b9832dabd88eab41ba673f210d)
Diff follows:
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
index 0644247..20a1203 100755
--- 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
index 7ba3c1a..b502f3d 100755
--- 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
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
