diff options
Diffstat (limited to 'spec/acceptance/beaker/git/group_checkout')
| -rw-r--r-- | spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb | 5 | ||||
| -rw-r--r-- | spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb | 5 | 
2 files changed, 6 insertions, 4 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 5c05baa..4888bd2 100644 --- a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb +++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb @@ -5,6 +5,7 @@ repo_name = 'testrepo_group_checkout'  group = 'mygroup'  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') @@ -21,7 +22,7 @@ hosts.each do |host|      server.start      EOF      create_remote_file(host, '/tmp/http_daemon.rb', http_daemon) -    on(host, "ruby /tmp/http_daemon.rb") +    on(host, "#{ruby} /tmp/http_daemon.rb")    end    step 'setup - create group' do @@ -30,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 diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb index 4551aee..3a72cc8 100644 --- a/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb +++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb @@ -5,6 +5,7 @@ repo_name = 'testrepo_group_checkout'  group = 'mygroup'  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 group' 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, "group { '#{group}': ensure => absent, }")    end | 
