Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #969 from puppetlabs/pdksync_remove_puppet5
[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..6f7777c8a998486eccc586d7b3b7e34fa1e13f58 100644
(file)
--- a/
spec/spec_helper_acceptance_local.rb
+++ b/
spec/spec_helper_acceptance_local.rb
@@
-3,17
+3,22
@@
UNSUPPORTED_PLATFORMS = ['RedHat', 'Suse', 'windows', 'AIX', 'Solaris'].freeze
MAX_RETRY_COUNT = 5
RETRY_WAIT = 3
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
-# 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
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
# 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