X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Facceptance%2Fapt_spec.rb;h=802858e8e24ad59596707eb8ce9d3a417ace19bd;hb=refs%2Fheads%2Frelease-prep;hp=e8950d1fbda992144e63ac653eb817148ad649f6;hpb=2b536b6a200e8f4f7f7ae37ec091abd06ca4cb70;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
index e8950d1..802858e 100644
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -1,33 +1,18 @@
-require 'spec_helper_acceptance'
-
-MAX_TIMEOUT_RETRY              = 3
-TIMEOUT_RETRY_WAIT             = 5
-TIMEOUT_ERROR_MATCHER = %r{no valid OpenPGP data found}
+# frozen_string_literal: true
 
-describe 'apt class' do
-  context 'reset' do
-    it 'fixes the sources.list' do
-      shell('cp /etc/apt/sources.list /tmp')
-    end
-  end
+require 'spec_helper_acceptance'
 
-  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' => 'keyserver.ubuntu.com',
           },
-        }
+        },
       }
       class { 'apt':
         update => {
@@ -40,27 +25,36 @@ describe 'apt class' do
           'sources.list.d' => true,
           'preferences'    => true,
           'preferences.d'  => true,
+          'apt.conf.d'     => true,
         },
         sources => $sources,
       }
-      EOS
+MANIFEST
 
+describe 'apt class' do
+  context 'with test start reset' do
+    it 'fixes the sources.list' do
+      run_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')
-      shell('apt-get -y --force-yes upgrade')
+      run_shell('apt-get update')
+      run_shell('apt-get -y --force-yes upgrade')
     end
   end
 
-  context 'reset' do
+  context 'with test end reset' do
     it 'fixes the sources.list' do
-      shell('cp /tmp/sources.list /etc/apt')
+      run_shell('cp /tmp/sources.list /etc/apt')
     end
   end
 end