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
(FM-6273) - Removing Debian 6
[puppet-modules/puppetlabs-apt.git]
/
spec
/
acceptance
/
apt_spec.rb
diff --git
a/spec/acceptance/apt_spec.rb
b/spec/acceptance/apt_spec.rb
index 5c389e3eeb0e79a227e61cfeb67fa90264ae32f3..df312a756041025184ffd2c8d21f5f0de5b7d601 100644
(file)
--- a/
spec/acceptance/apt_spec.rb
+++ b/
spec/acceptance/apt_spec.rb
@@
-1,5
+1,9
@@
require 'spec_helper_acceptance'
require 'spec_helper_acceptance'
+MAX_TIMEOUT_RETRY = 3
+TIMEOUT_RETRY_WAIT = 5
+TIMEOUT_ERROR_MATCHER = /no valid OpenPGP data found/
+
describe 'apt class' do
context 'reset' do
describe 'apt class' do
context 'reset' do
@@
-20,7
+24,7
@@
describe 'apt class' do
'location' => 'http://apt.puppetlabs.com',
'repos' => 'main',
'key' => {
'location' => 'http://apt.puppetlabs.com',
'repos' => 'main',
'key' => {
- 'id' => '
47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30
',
+ 'id' => '
6F6B15509CF8E59E6E469F327F438280EF8D349F
',
'server' => 'hkps.pool.sks-keyservers.net',
},
},
'server' => 'hkps.pool.sks-keyservers.net',
},
},
@@
-29,8
+33,8
@@
describe 'apt class' do
class { 'apt':
update => {
'frequency' => 'always',
class { 'apt':
update => {
'frequency' => 'always',
- 'timeout' =>
'400'
,
- 'tries' =>
'3'
,
+ 'timeout' =>
400
,
+ 'tries' =>
3
,
},
purge => {
'sources.list' => true,
},
purge => {
'sources.list' => true,
@@
-42,7
+46,11
@@
describe 'apt class' do
}
EOS
}
EOS
- apply_manifest(pp, :catch_failures => true)
+ #Apply the manifest (Retry if timeout error is received from key pool)
+ retry_on_error_matching(MAX_TIMEOUT_RETRY, TIMEOUT_RETRY_WAIT, TIMEOUT_ERROR_MATCHER) do
+ apply_manifest(pp, :catch_failures => true)
+ end
+
apply_manifest(pp, :catch_failures => true)
end
it 'should still work' do
apply_manifest(pp, :catch_failures => true)
end
it 'should still work' do