From 4a2f22c00d1348aaa136f7269d2b5c65bcb54dc5 Mon Sep 17 00:00:00 2001 From: Dominic Maraglia Date: Tue, 12 Jul 2011 17:34:22 -0700 Subject: (maint) Fix platform dection for RHEL Detecting supported platform used incorrect string for RHEL. Changed string from 'redhat' to 'rhel' --- .../resource/service/ticket_4123_should_list_all_running_redhat.rb | 3 +-- .../tests/resource/service/ticket_4124_should_list_all_disabled.rb | 2 +- 2 files changed, 2 insertions(+), 3 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 index 127e943a9..9f0fdc5c7 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 @@ -4,8 +4,7 @@ step "Validate services running agreement ralsh vs. OS service count" # ticket_4123_should_list_all_running_redhat.sh hosts.each do |host| - if host['platform'].include?('centos') or host['platform'].include?('redhat') - puts "XXX #{host['platform']}" + if host['platform'].include?('centos') or host['platform'].include?('rhel') run_script_on(host,'acceptance-tests/tests/resource/service/ticket_4123_should_list_all_running_redhat.sh') else skip_test "Test not supported on this plaform" 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 db96ad91c..13ad5ceac 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 @@ -4,7 +4,7 @@ step "Validate disabled services agreement ralsh vs. OS service count" # ticket_4124_should_list_all_disabled.sh hosts.each do |host| - unless host['platform'].include? 'centos' or host['platform'].include? 'redhat' + unless host['platform'].include? 'centos' or host['platform'].include? 'rhel' skip_test "Test not supported on this plaform" else run_script_on(host,'acceptance-tests/tests/resource/service/ticket_4124_should_list_all_disabled.sh') -- cgit