summaryrefslogtreecommitdiff
path: root/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
diff options
context:
space:
mode:
authorJohn Duarte <john.duarte@puppetlabs.com>2014-05-15 11:43:29 -0700
committerJohn Duarte <john.duarte@puppetlabs.com>2014-05-18 11:38:20 -0700
commit97e64b52f63f3dd673dfa2fe92c71d4d9ddbcbc7 (patch)
tree7c67a56ccf64768392b0eb5e7c7061cb31b33375 /spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
parent3d35e61e4377e73365b9f7c340b225d787fe3cbb (diff)
Add conditional ruby path based on pe
Diffstat (limited to 'spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb')
-rw-r--r--spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
index d43ae0a..f2486cd 100644
--- a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
+++ b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
@@ -7,6 +7,7 @@ password = 'bar'
http_server_script = 'basic_auth_http_daemon.rb'
hosts.each do |host|
+ ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
tmpdir = host.tmpdir('vcsrepo')
step 'setup - create repo' do
install_package(host, 'git')
@@ -34,12 +35,12 @@ hosts.each do |host|
server.start
EOF
create_remote_file(host, "#{tmpdir}/#{http_server_script}", script)
- on(host, "ruby #{tmpdir}/#{http_server_script}")
+ on(host, "#{ruby} #{tmpdir}/#{http_server_script} &")
end
teardown do
on(host, "rm -fr #{tmpdir}")
- on(host, "ps ax | grep 'ruby #{tmpdir}/#{http_server_script}' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
+ on(host, "ps ax | grep '#{ruby} #{tmpdir}/#{http_server_script}' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
end
step 'checkout with puppet using basic auth' do