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

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
index e8950d1..7fe1d03 100644
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -1,33 +1,16 @@
 require 'spec_helper_acceptance'
 
-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')
-    end
-  end
-
-  context 'all the things' do
-    it 'works with no errors' do
-      pp = <<-EOS
-      if $::lsbdistcodename == 'lucid' {
-        $sources = undef
-      } else {
-        $sources = {
-          'puppetlabs' => {
-            'ensure'   => present,
-            'location' => 'http://apt.puppetlabs.com',
-            'repos'    => 'main',
-            'key'      => {
-              'id'     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-              'server' => 'hkps.pool.sks-keyservers.net',
-            },
+everything_everything_pp = <<-MANIFEST
+      $sources = {
+        'puppetlabs' => {
+          'ensure'   => present,
+          'location' => 'http://apt.puppetlabs.com',
+          'repos'    => 'main',
+          'key'      => {
+            'id'     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
+            'server' => 'pool.sks-keyservers.net',
           },
-        }
+        },
       }
       class { 'apt':
         update => {
@@ -43,14 +26,21 @@ describe 'apt class' do
         },
         sources => $sources,
       }
-      EOS
+  MANIFEST
 
+describe 'apt class' do
+  context 'with reset' do
+    it 'fixes the sources.list' do
+      shell('cp /etc/apt/sources.list /tmp')
+    end
+  end
+
+  context 'with all the things' do
+    it 'works with no errors' do
       # 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)
+      retry_on_error_matching do
+        apply_manifest(everything_everything_pp, catch_failures: true)
       end
-
-      apply_manifest(pp, catch_failures: true)
     end
     it 'stills work' do
       shell('apt-get update')
@@ -58,7 +48,7 @@ describe 'apt class' do
     end
   end
 
-  context 'reset' do
+  context 'with reset' do
     it 'fixes the sources.list' do
       shell('cp /tmp/sources.list /etc/apt')
     end