"This change pins the puppetlabs-puppet_agent module to v4.12.1. Previosuly the fixut...

[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 d5339aeb8d524ea868d68d3cdbc92b786a659e3e..9f0cd18b7bcde553d07c17d16eed87edad40dc5b 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)}.freeze
+MAX_RETRY_COUNT       = 10
 
-# this is needed for puppet facts / apply
-lsb_package = <<-MANIFEST
+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
-apply_manifest(lsb_package)
+    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