summaryrefslogtreecommitdiffstats
path: root/acceptance
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2011-06-06 14:40:39 -0700
committerMatt Robinson <matt@puppetlabs.com>2011-06-06 14:40:39 -0700
commitc8df02703ac29b00140648640f85ec044a9cfd6e (patch)
tree419bf37a4f682c66e48a99636b99cd851d2d162a /acceptance
parent834191c81e6e390d9c147bddba286f1660780aa1 (diff)
downloadpuppet-c8df02703ac29b00140648640f85ec044a9cfd6e.tar.gz
puppet-c8df02703ac29b00140648640f85ec044a9cfd6e.tar.xz
puppet-c8df02703ac29b00140648640f85ec044a9cfd6e.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>
Diffstat (limited to 'acceptance')
-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