X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=spec%2Facceptance%2Fapt_spec.rb;h=e8950d1fbda992144e63ac653eb817148ad649f6;hb=f610bedc5f33db5fdee2ad49eeda95268ab0b9a5;hp=df312a756041025184ffd2c8d21f5f0de5b7d601;hpb=e014fc04ed8358e4f7c2e87f7434df9817a4c7bb;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb index df312a7..e8950d1 100644 --- a/spec/acceptance/apt_spec.rb +++ b/spec/acceptance/apt_spec.rb @@ -2,10 +2,9 @@ require 'spec_helper_acceptance' MAX_TIMEOUT_RETRY = 3 TIMEOUT_RETRY_WAIT = 5 -TIMEOUT_ERROR_MATCHER = /no valid OpenPGP data found/ +TIMEOUT_ERROR_MATCHER = %r{no valid OpenPGP data found} describe 'apt class' do - context 'reset' do it 'fixes the sources.list' do shell('cp /etc/apt/sources.list /tmp') @@ -13,7 +12,7 @@ describe 'apt class' do end context 'all the things' do - it 'should work with no errors' do + it 'works with no errors' do pp = <<-EOS if $::lsbdistcodename == 'lucid' { $sources = undef @@ -46,14 +45,14 @@ describe 'apt class' do } EOS - #Apply the manifest (Retry if timeout error is received from key pool) + # 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) + apply_manifest(pp, catch_failures: true) end - apply_manifest(pp, :catch_failures => true) + apply_manifest(pp, catch_failures: true) end - it 'should still work' do + it 'stills work' do shell('apt-get update') shell('apt-get -y --force-yes upgrade') end @@ -64,5 +63,4 @@ describe 'apt class' do shell('cp /tmp/sources.list /etc/apt') end end - end