summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2011-06-06 15:07:29 -0700
committerMatt Robinson <matt@puppetlabs.com>2011-06-06 15:07:29 -0700
commit8ebec1effc8038b1f59537450f3fe27249d543ee (patch)
tree68952a18a693a4baa9db62381f27209f9bce58d5
parent9660f5e12f10eb20cb2c2beb7d66b931919b0019 (diff)
downloadpuppet-8ebec1effc8038b1f59537450f3fe27249d543ee.tar.gz
puppet-8ebec1effc8038b1f59537450f3fe27249d543ee.tar.xz
puppet-8ebec1effc8038b1f59537450f3fe27249d543ee.zip
(#7193) Fix path issues with acceptance tests that call old shell tests
Some rearranging of the acceptance test directories caused some ruby tests that referenced old shell tests to lose their relative paths. Paired-with: Dominic Maraglia <dominic@puppetlabs.com>
-rwxr-xr-xacceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb2
-rwxr-xr-xacceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb2
2 files changed, 2 insertions, 2 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 b4c2bc14d..9bedd6e04 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
@@ -7,6 +7,6 @@ hosts.each do |host|
unless host['platform'].include? 'centos' or host['platform'].include? 'redhat'
skip_test "Test not supported on this plaform"
else
- run_script_on(host,'tests/acceptance/resource/service/ticket_4123_should_list_all_running_redhat.sh')
+ run_script_on(host,'acceptance-tests/tests/resource/service/ticket_4123_should_list_all_running_redhat.sh')
end
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 4add108ff..db96ad91c 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
@@ -7,6 +7,6 @@ hosts.each do |host|
unless host['platform'].include? 'centos' or host['platform'].include? 'redhat'
skip_test "Test not supported on this plaform"
else
- run_script_on(host,'tests/acceptance/resource/service/ticket_4124_should_list_all_disabled.sh')
+ run_script_on(host,'acceptance-tests/tests/resource/service/ticket_4124_should_list_all_disabled.sh')
end
end