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 #633 from puppetlabs/Paula_modulesync
[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 e409a9098f4d8b93b1c9284cf905fc3434fc8307..52415f5afaecb4e0cfe28fbe2af689c3ffad3f77 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
@@
-11,27
+15,42
@@
describe 'apt class' do
context 'all the things' do
it 'should work with no errors' do
pp = <<-EOS
context 'all the things' do
it 'should work with no errors' do
pp = <<-EOS
- class { 'apt':
- always_apt_update => true,
- purge_sources_list => true,
- purge_sources_list_d => true,
- purge_preferences => true,
- purge_preferences_d => true,
- update_timeout => '400',
- update_tries => '3',
- sources => {
+ if $::lsbdistcodename == 'lucid' {
+ $sources = undef
+ } else {
+ $sources = {
'puppetlabs' => {
'puppetlabs' => {
- 'ensure' => present,
- 'location' => 'http://apt.puppetlabs.com',
- 'repos' => 'main',
- 'key' => '4BD6EC30',
- 'key_server' => 'pgp.mit.edu',
- }
+ 'ensure' => present,
+ 'location' => 'http://apt.puppetlabs.com',
+ 'repos' => 'main',
+ 'key' => {
+ 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
+ 'server' => 'hkps.pool.sks-keyservers.net',
+ },
+ },
+ }
+ }
+ class { 'apt':
+ update => {
+ 'frequency' => 'always',
+ 'timeout' => '400',
+ 'tries' => '3',
},
},
+ purge => {
+ 'sources.list' => true,
+ 'sources.list.d' => true,
+ 'preferences' => true,
+ 'preferences.d' => true,
+ },
+ sources => $sources,
}
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