Skip to content

Commit

Permalink
Make sure we're using system ruby in the mod_passenger tests
Browse files Browse the repository at this point in the history
PE ships with different versions of ruby than the version mod_passenger
was compiled against. Make sure we use the system ruby in the tests.
  • Loading branch information
Morgan Haskel committed Dec 30, 2014
1 parent 1252853 commit b659a8e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions spec/acceptance/mod_passenger_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class { 'apache::mod::passenger': }
end

it 'should output status via passenger-memory-stats' do
shell("/usr/sbin/passenger-memory-stats") do |r|
shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats") do |r|
expect(r.stdout).to match(/Apache processes/)
expect(r.stdout).to match(/Nginx processes/)
expect(r.stdout).to match(/Passenger processes/)
Expand All @@ -158,7 +158,7 @@ class { 'apache::mod::passenger': }
unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
it 'should output status via passenger-status' do
# xml output not available on ubunutu <= 10.04, so sticking with default pool output
shell("/usr/sbin/passenger-status") do |r|
shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-status") do |r|
# spacing may vary
expect(r.stdout).to match(/[\-]+ General information [\-]+/)
if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
Expand Down

0 comments on commit b659a8e

Please sign in to comment.