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
pdksync_heads/master-0-g34e3266
[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 7391d211ccf030f3f9d8fc32561f6e14acabeab5..258116c5629d4b5bddd33958cc3552fd22027cda 100644
(file)
--- a/
spec/spec_helper_acceptance.rb
+++ b/
spec/spec_helper_acceptance.rb
@@
-15,7
+15,7
@@
install_bolt_on(hosts) unless pe_install?
install_module_on(hosts)
install_module_dependencies_on(hosts)
install_module_on(hosts)
install_module_dependencies_on(hosts)
-UNSUPPORTED_PLATFORMS = ['RedHat',
'Suse','windows','AIX','Solaris']
+UNSUPPORTED_PLATFORMS = ['RedHat',
'Suse', 'windows', 'AIX', 'Solaris'].freeze
DEFAULT_PASSWORD = if default[:hypervisor] == 'vagrant'
'vagrant'
DEFAULT_PASSWORD = if default[:hypervisor] == 'vagrant'
'vagrant'
@@
-27,7
+27,8
@@
def puppet_version
(on default, puppet('--version')).output.chomp
end
(on default, puppet('--version')).output.chomp
end
-def run_puppet_access_login(user:, password: '~!@#$%^*-/ aZ', lifetime: '5y')
+def run_puppet_access_login(user:, password:
+ '~!@#$%^*-/ aZ', lifetime: '5y')
on(master, puppet('access', 'login', '--username', user, '--lifetime', lifetime), stdin: password)
end
on(master, puppet('access', 'login', '--username', user, '--lifetime', lifetime), stdin: password)
end
@@
-69,25
+70,21
@@
def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
begin
try += 1
yield
begin
try += 1
yield
- rescue Exception => e
- if try < max_retry_count && (error_matcher == nil || e.message =~ error_matcher)
- sleep retry_wait_interval_secs
- retry
- else
- raise
- end
+ rescue StandardError => e
+ raise unless try < max_retry_count && (error_matcher.nil? || e.message =~ error_matcher)
+ sleep retry_wait_interval_secs
+ retry
end
end
RSpec.configure do |c|
end
end
RSpec.configure do |c|
- # Project root
- proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+ File.expand_path(File.join(File.dirname(__FILE__), '..'))
# Readable test descriptions
c.formatter = :documentation
# Configure all nodes in nodeset
c.before :suite do
# Readable test descriptions
c.formatter = :documentation
# Configure all nodes in nodeset
c.before :suite do
- run_puppet_access_login(user: 'admin') if pe_install?
+ run_puppet_access_login(user: 'admin') if pe_install?
&& puppet_version =~ %r{(5\.\d\.\d)}
end
end
end
end