X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Facceptance%2Fapt_spec.rb;h=df312a756041025184ffd2c8d21f5f0de5b7d601;hb=bd3b3fbe990bfa824ebed3504c0c82175d7c7ec9;hp=8a9d4ca6eb23e1210f277371ca7b0a2327613343;hpb=3760d350a8341b8726e9be5c8273a529d245285a;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb index 8a9d4ca..df312a7 100644 --- a/spec/acceptance/apt_spec.rb +++ b/spec/acceptance/apt_spec.rb @@ -1,5 +1,9 @@ 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 @@ -29,8 +33,8 @@ describe 'apt class' do class { 'apt': update => { 'frequency' => 'always', - 'timeout' => '400', - 'tries' => '3', + 'timeout' => 400, + 'tries' => 3, }, purge => { 'sources.list' => true, @@ -42,7 +46,11 @@ describe 'apt class' do } 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