summaryrefslogtreecommitdiff
path: root/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb')
-rw-r--r--spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
index 28a17b8..bd9b498 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
@@ -5,6 +5,7 @@ repo_name = 'testrepo_user_checkout'
user = 'myuser'
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')
@@ -28,7 +29,7 @@ hosts.each do |host|
server.start
EOF
create_remote_file(host, '/tmp/https_daemon.rb', https_daemon)
- #on(host, "ruby /tmp/https_daemon.rb")
+ #on(host, "#{ruby} /tmp/https_daemon.rb")
end
step 'setup - create user' do
@@ -37,7 +38,7 @@ hosts.each do |host|
teardown do
on(host, "rm -fr #{tmpdir}")
- on(host, 'ps ax | grep "ruby /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+ on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
apply_manifest_on(host, "user { '#{user}': ensure => absent, }")
end