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=7fe1d033297ea9061b8ee5569361083785c83838;hpb=16c73c8ab4786a485cce0faaf2085100b77ec870;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
index 7fe1d03..802858e 100644
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 
 everything_everything_pp = <<-MANIFEST
@@ -8,7 +10,7 @@ everything_everything_pp = <<-MANIFEST
           'repos'    => 'main',
           'key'      => {
             'id'     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-            'server' => 'pool.sks-keyservers.net',
+            'server' => 'keyserver.ubuntu.com',
           },
         },
       }
@@ -23,15 +25,16 @@ everything_everything_pp = <<-MANIFEST
           'sources.list.d' => true,
           'preferences'    => true,
           'preferences.d'  => true,
+          'apt.conf.d'     => true,
         },
         sources => $sources,
       }
-  MANIFEST
+MANIFEST
 
 describe 'apt class' do
-  context 'with reset' do
+  context 'with test start reset' do
     it 'fixes the sources.list' do
-      shell('cp /etc/apt/sources.list /tmp')
+      run_shell('cp /etc/apt/sources.list /tmp')
     end
   end
 
@@ -42,15 +45,16 @@ describe 'apt class' do
         apply_manifest(everything_everything_pp, catch_failures: true)
       end
     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 'with 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