From 2f48954a34dcd8b0686ff8020d5071e57ba5e0a1 Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Tue, 23 Sep 2014 10:58:30 -0700 Subject: [PATCH] (FM-1913) fix passenger tests on EL derivatives 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. --- spec/acceptance/mod_passenger_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb index 54b6a7731..e3e4203f9 100644 --- a/spec/acceptance/mod_passenger_spec.rb +++ b/spec/acceptance/mod_passenger_spec.rb @@ -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