Skip to content

Commit

Permalink
(FM-1913) fix passenger tests on EL derivatives
Browse files Browse the repository at this point in the history
Previously we were excluding by "operatingsystem" == "RedHat" which
doesn't account for RedHat derivatives like Centos. This changes the
tests to check against "osfamily" instead.
  • Loading branch information
justinstoller committed Sep 23, 2014
1 parent 5ef11d7 commit 2f48954
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion spec/acceptance/mod_passenger_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ class { 'apache::mod::passenger': }
# no fedora 18 passenger package yet, and rhel5 packages only exist for ruby 1.8.5
unless (fact('operatingsystem') == 'Fedora' and fact('operatingsystemrelease').to_f >= 18) or (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5' and fact('rubyversion') != '1.8.5')

if fact('operatingsystem') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
pending('test passenger - RHEL7 packages don\'t exist')
else
context "default passenger config" do
Expand Down

0 comments on commit 2f48954

Please sign in to comment.