X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Facceptance%2Fapt_spec.rb;h=e8950d1fbda992144e63ac653eb817148ad649f6;hb=f610bedc5f33db5fdee2ad49eeda95268ab0b9a5;hp=3c97421ab0c1eded83c1f161544924d0cb552ed3;hpb=13afe8b7af51c162d2fe6bafa207bb56f2471a76;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
index 3c97421..e8950d1 100644
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -1,7 +1,10 @@
 require 'spec_helper_acceptance'
 
-describe 'apt class' do
+MAX_TIMEOUT_RETRY              = 3
+TIMEOUT_RETRY_WAIT             = 5
+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')
@@ -9,36 +12,49 @@ 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
-      class { 'apt':
-        always_apt_update    => true,
-        disable_keys         => 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' => {
-            '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,
         },
-        fancy_progress       => true,
+        sources => $sources,
       }
       EOS
 
-      apply_manifest(pp, :catch_failures => true)
-      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
+    it 'stills work' do
       shell('apt-get update')
-      shell('apt-get -y upgrade')
+      shell('apt-get -y --force-yes upgrade')
     end
   end
 
@@ -47,5 +63,4 @@ describe 'apt class' do
       shell('cp /tmp/sources.list /etc/apt')
     end
   end
-
 end