Merge pull request voxpupuli#944 from wyardley/fix_accept_failures

add before => Package['nginx'] on repo absent ensures
Rubueno · Oct 26, 2016 · d9d3c46 · d9d3c46
2 parents 9d3f205 + d7d50d4
commit d9d3c46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/manifests/package/redhat.pp b/manifests/package/redhat.pp
@@ -44,6 +44,7 @@
 
         yumrepo { 'passenger':
           ensure => absent,
+          before => Package['nginx'],
         }
 
       }
@@ -60,6 +61,7 @@
 
         yumrepo { 'passenger':
           ensure => absent,
+          before => Package['nginx'],
         }
 
       }
@@ -78,6 +80,7 @@
 
           yumrepo { 'nginx-release':
             ensure => absent,
+            before => Package['nginx'],
           }
 
           package { 'passenger':

diff --git a/spec/classes/package_spec.rb b/spec/classes/package_spec.rb
@@ -20,6 +20,8 @@
           'ensure' => 'absent'
         )
       end
+      it { is_expected.to contain_yumrepo('nginx-release').that_comes_before('Package[nginx]') }
+      it { is_expected.to contain_yumrepo('passenger').that_comes_before('Package[nginx]') }
       it { is_expected.to contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::redhat]') }
       it { is_expected.to contain_anchor('nginx::package::end').that_requires('Class[nginx::package::redhat]') }
     end
@@ -36,6 +38,8 @@
           'ensure' => 'absent'
         )
       end
+      it { is_expected.to contain_yumrepo('nginx-release').that_comes_before('Package[nginx]') }
+      it { is_expected.to contain_yumrepo('passenger').that_comes_before('Package[nginx]') }
     end
 
     context 'package_source => passenger' do
@@ -53,6 +57,8 @@
           'ensure' => 'absent'
         )
       end
+      it { is_expected.to contain_yumrepo('passenger').that_comes_before('Package[nginx]') }
+      it { is_expected.to contain_yumrepo('nginx-release').that_comes_before('Package[nginx]') }
       it { is_expected.to contain_package('passenger') }
     end