X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Facceptance%2Fapt_spec.rb;h=550574867b5deef5053118d77ed05ed60e5b6f50;hb=34452eb00d409290a1c19bd811416c528b6cd187;hp=52415f5afaecb4e0cfe28fbe2af689c3ffad3f77;hpb=68cdcf71a3c4cdc0d431719494a4572c28afd9c4;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
index 52415f5..5505748 100644
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -2,19 +2,9 @@ require 'spec_helper_acceptance'
 
 MAX_TIMEOUT_RETRY              = 3
 TIMEOUT_RETRY_WAIT             = 5
-TIMEOUT_ERROR_MATCHER    = /no valid OpenPGP data found/
+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 'should work with no errors' do
-      pp = <<-EOS
+everything_everything_pp = <<-MANIFEST
       if $::lsbdistcodename == 'lucid' {
         $sources = undef
       } else {
@@ -33,8 +23,8 @@ describe 'apt class' do
       class { 'apt':
         update => {
           'frequency' => 'always',
-          'timeout'   => '400',
-          'tries'     => '3',
+          'timeout'   => 400,
+          'tries'     => 3,
         },
         purge => {
           'sources.list'   => true,
@@ -44,25 +34,33 @@ describe 'apt class' do
         },
         sources => $sources,
       }
-      EOS
+  MANIFEST
 
-      #Apply the manifest (Retry if timeout error is received from key pool)
+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)
+        apply_manifest(everything_everything_pp, catch_failures: true)
       end
 
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(everything_everything_pp, catch_failures: true)
     end
-    it 'should still work' do
+    it 'stills work' do
       shell('apt-get update')
       shell('apt-get -y --force-yes upgrade')
     end
   end
 
-  context 'reset' do
+  context 'with reset' do
     it 'fixes the sources.list' do
       shell('cp /tmp/sources.list /etc/apt')
     end
   end
-
 end