summaryrefslogtreecommitdiff
path: root/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb')
-rw-r--r--spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
index 4888bd2..0c86c77 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
@@ -5,7 +5,7 @@ repo_name = 'testrepo_group_checkout'
group = 'mygroup'
hosts.each do |host|
- ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+ ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
tmpdir = host.tmpdir('vcsrepo')
step 'setup - create repo' do
install_package(host, 'git')
@@ -31,7 +31,7 @@ hosts.each do |host|
teardown do
on(host, "rm -fr #{tmpdir}")
- on(host, 'ps ax | grep "#{ruby} /tmp/http_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+ on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
apply_manifest_on(host, "group { '#{group}': ensure => absent, }")
end