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
Update CODEOWNERS
[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 6f7777c8a998486eccc586d7b3b7e34fa1e13f58..b0e672821746989cd5d1e93f840d91ea89521f65 100644
(file)
--- a/
spec/spec_helper_acceptance_local.rb
+++ b/
spec/spec_helper_acceptance_local.rb
@@
-1,19
+1,19
@@
# frozen_string_literal: true
UNSUPPORTED_PLATFORMS = ['RedHat', 'Suse', 'windows', 'AIX', 'Solaris'].freeze
# 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
RETRY_WAIT = 3
ERROR_MATCHER = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed)}.freeze
+MAX_RETRY_COUNT = 10
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).
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
+ lsb_package = <<
~
MANIFEST
+
package { 'lsb-release':
+
ensure => installed,
+
}
+
MANIFEST
include PuppetLitmus
extend PuppetLitmus
apply_manifest(lsb_package)
include PuppetLitmus
extend PuppetLitmus
apply_manifest(lsb_package)
@@
-40,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)
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
sleep retry_wait_interval_secs
retry
end