Update CODEOWNERS

[puppet-modules/puppetlabs-apt.git] / spec / acceptance / apt_spec.rb

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
index df312a756041025184ffd2c8d21f5f0de5b7d601..802858e8e24ad59596707eb8ce9d3a417ace19bd 100644 (file)
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -1,34 +1,18 @@
-require 'spec_helper_acceptance'
-
-MAX_TIMEOUT_RETRY              = 3
-TIMEOUT_RETRY_WAIT             = 5
-TIMEOUT_ERROR_MATCHER    = /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 'should work 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 => {
@@ -41,28 +25,36 @@ describe 'apt class' do
           'sources.list.d' => true,
           'preferences'    => true,
           'preferences.d'  => true,
+          'apt.conf.d'     => true,
         },
         sources => $sources,
       }
-      EOS
+MANIFEST
 
-      #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
+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
 
-      apply_manifest(pp, :catch_failures => true)
+  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 do
+        apply_manifest(everything_everything_pp, catch_failures: true)
+      end
     end
-    it 'should still work' do
-      shell('apt-get update')
-      shell('apt-get -y --force-yes upgrade')
+
+    it 'stills work' do
+      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