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
(maint) reduce run time for acceptance testing
[puppet-modules/puppetlabs-apt.git]
/
spec
/
spec_helper_acceptance.rb
diff --git
a/spec/spec_helper_acceptance.rb
b/spec/spec_helper_acceptance.rb
index a7bd4f441ca7be72d6cbfd8f308e601d448edafb..29b178a51e3a8a125f65e273dc66e9e086c29658 100644
(file)
--- a/
spec/spec_helper_acceptance.rb
+++ b/
spec/spec_helper_acceptance.rb
@@
-14,8
+14,8
@@
install_module_on(hosts)
install_module_dependencies_on(hosts)
UNSUPPORTED_PLATFORMS = ['RedHat', 'Suse', 'windows', 'AIX', 'Solaris'].freeze
install_module_dependencies_on(hosts)
UNSUPPORTED_PLATFORMS = ['RedHat', 'Suse', 'windows', 'AIX', 'Solaris'].freeze
-MAX_RETRY_COUNT =
12
-RETRY_WAIT =
10
+MAX_RETRY_COUNT =
5
+RETRY_WAIT =
3
ERROR_MATCHER = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed)}
# This method allows a block to be passed in and if an exception is raised
ERROR_MATCHER = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed)}
# This method allows a block to be passed in and if an exception is raised
@@
-36,7
+36,7
@@
def retry_on_error_matching(max_retry_count = MAX_RETRY_COUNT, retry_wait_interv
try += 1
yield
rescue StandardError => e
try += 1
yield
rescue StandardError => e
- raise unless try < max_retry_count && (error_matcher.nil? || e.message =~ error_matcher)
+ 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
@@
-50,7
+50,7
@@
RSpec.configure do |c|
# Configure all nodes in nodeset
c.before :suite do
# Configure all nodes in nodeset
c.before :suite do
- run_puppet_access_login(user: 'admin') if pe_install? &&
puppet_version =~ %r{(5\.\d\.\d)}
+ run_puppet_access_login(user: 'admin') if pe_install? &&
(Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
hosts.each do |host|
# This will be removed, this is temporary to test localisation.
hosts.each do |host|
# This will be removed, this is temporary to test localisation.
@@
-65,12
+65,6
@@
RSpec.configure do |c|
install_language_on(host, 'ja_JP.utf-8') if not_controller(host)
# This will be removed, this is temporary to test localisation.
end
install_language_on(host, 'ja_JP.utf-8') if not_controller(host)
# This will be removed, this is temporary to test localisation.
end
- # Required for binding tests.
- if fact('osfamily') == 'RedHat'
- if fact('operatingsystemmajrelease') =~ %r{7} || fact('operatingsystem') =~ %r{Fedora}
- shell('yum install -y bzip2')
- end
- end
on host, puppet('module', 'install', 'stahnma/epel')
end
end
on host, puppet('module', 'install', 'stahnma/epel')
end
end