Release prep v9.1.0

[puppet-modules/puppetlabs-apt.git] / spec / spec_helper_acceptance_local.rb

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 4022171b5592006228e034631069817974e7253e..b0e672821746989cd5d1e93f840d91ea89521f65 100644 (file)
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
 UNSUPPORTED_PLATFORMS = ['RedHat', 'Suse', 'windows', 'AIX', 'Solaris'].freeze
-MAX_RETRY_COUNT       = 5
 RETRY_WAIT            = 3
-ERROR_MATCHER         = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed)}
+ERROR_MATCHER         = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed)}.freeze
+MAX_RETRY_COUNT       = 10
 
-# this is needed for puppet facts / apply
-lsb_package = <<-MANIFEST
-package { 'lsb-release':
-  ensure => installed,
-}
-MANIFEST
-
-include PuppetLitmus
-apply_manifest(lsb_package)
+RSpec.configure do |c|
+  c.before :suite do
+    # lsb-release is needed for facter 3 (puppet 6) to resolve os.distro facts. Not needed with facter
+    # 4 (puppet 7).
+    lsb_package = <<~MANIFEST
+      package { 'lsb-release':
+        ensure => installed,
+      }
+    MANIFEST
+    include PuppetLitmus
+    extend PuppetLitmus
+    apply_manifest(lsb_package)
+  end
+end
 
 # This method allows a block to be passed in and if an exception is raised
 # that matches the 'error_matcher' matcher, the block will wait a set number
@@ -35,6 +40,7 @@ def retry_on_error_matching(max_retry_count = MAX_RETRY_COUNT, retry_wait_interv
     yield
   rescue StandardError => e
     raise('Attempted this %{value0} times. Raising %{value1}' % { value0: max_retry_count, value1: e }) unless try < max_retry_count && (error_matcher.nil? || e.message =~ error_matcher)
+
     sleep retry_wait_interval_secs
     retry
   end