diff options
| author | John Duarte <john.duarte@puppetlabs.com> | 2014-05-16 14:58:17 -0700 |
|---|---|---|
| committer | John Duarte <john.duarte@puppetlabs.com> | 2014-05-18 11:38:20 -0700 |
| commit | 0406d627bcd7e24d181944b4d2c70a7b6e50ccf5 (patch) | |
| tree | 14b470616b40de84da9404c0b94fef8c34a7388a /spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb | |
| parent | 123fe4099e4e4fdda7b34a769458a1dcaad75aae (diff) | |
| download | puppet-vcsrepo-0406d627bcd7e24d181944b4d2c70a7b6e50ccf5.tar.gz puppet-vcsrepo-0406d627bcd7e24d181944b4d2c70a7b6e50ccf5.tar.bz2 | |
Fix calls to ruby
Diffstat (limited to 'spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb')
| -rw-r--r-- | spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb index 9fea700..6da34e8 100644 --- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb +++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb @@ -5,7 +5,7 @@ repo_name = 'testrepo_branch_checkout' branch = 'a_branch' 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') @@ -27,7 +27,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") end step 'checkout a branch with puppet' do |