X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=spec%2Fclasses%2Fapt_update_spec.rb;h=71774550f8b2796a559ad91c3dfd866951f57ccb;hb=c6019f5a3f7587a86662a34ade2d68dc419d2f60;hp=463566b986f3201a0f03852a6072033de0a4ab6b;hpb=ef0d4e7337a535a25d76b73aebf6bfdda975f533;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb
index 463566b..7177455 100644
--- a/spec/classes/apt_update_spec.rb
+++ b/spec/classes/apt_update_spec.rb
@@ -9,14 +9,22 @@ describe 'apt::update', type: :class do
       'we are due for a run'                         => 1_406_660_561,
       'the update-success-stamp file does not exist' => -1,
     }.each_pair do |desc, factval|
-      context "when $::apt_update_last_success indicates #{desc}" do
+      context "when $apt_update_last_success indicates #{desc}" do
         let(:facts) do
           {
-            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-            lsbdistid: 'Debian',
-            osfamily: 'Debian',
-            apt_update_last_success: factval,
-            lsbdistcodename: 'jessie',
+            os: {
+              family: 'Debian',
+              name: 'Debian',
+              release: {
+                major: '9',
+                full: '9.0',
+              },
+              distro: {
+                codename: 'stretch',
+                id: 'Debian',
+              },
+            },
+            'apt_update_last_success': factval,
           }
         end
         let(:pre_condition) do
@@ -29,13 +37,21 @@ describe 'apt::update', type: :class do
         end
       end
     end
-    context 'when $::apt_update_last_success is nil' do
+    context 'when $apt_update_last_success is nil' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          osfamily: 'Debian',
-          lsbdistcodename: 'jessie',
+          os: {
+            family: 'Debian',
+            name: 'Debian',
+            release: {
+              major: '9',
+              full: '9.0',
+            },
+            distro: {
+              codename: 'stretch',
+              id: 'Debian',
+            },
+          },
         }
       end
       let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'always' },}" }
@@ -45,6 +61,36 @@ describe 'apt::update', type: :class do
         is_expected.to contain_exec('apt_update').with('refreshonly' => false)
       end
     end
+    context 'and Exec[apt_update] refreshonly is overridden to true and has recent run' do
+      let(:facts) do
+        {
+          os: {
+            family: 'Debian',
+            name: 'Debian',
+            release: {
+              major: '9',
+              full: '9.0',
+            },
+            distro: {
+              codename: 'stretch',
+              id: 'Debian',
+            },
+          },
+          'apt_update_last_success': Time.now.to_i,
+        }
+      end
+      let(:pre_condition) do
+        "
+        class{'::apt': update => {'frequency' => 'always' },}
+        Exec <| title=='apt_update' |> { refreshonly => true }
+        "
+      end
+
+      it 'skips an apt-get update run' do
+        # set the apt_update exec's refreshonly attribute to false
+        is_expected.to contain_exec('apt_update').with('refreshonly' => true)
+      end
+    end
   end
   context "when apt::update['frequency']='reluctantly'" do
     {
@@ -52,14 +98,22 @@ describe 'apt::update', type: :class do
       'we are due for a run'                         => 1_406_660_561,
       'the update-success-stamp file does not exist' => -1,
     }.each_pair do |desc, factval|
-      context "when $::apt_update_last_success indicates #{desc}" do
+      context "when $apt_update_last_success indicates #{desc}" do
         let(:facts) do
           {
-            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-            lsbdistid: 'Debian',
-            osfamily: 'Debian',
-            apt_update_last_success: factval,
-            lsbdistcodename: 'jessie',
+            os: {
+              family: 'Debian',
+              name: 'Debian',
+              release: {
+                major: '9',
+                full: '9.0',
+              },
+              distro: {
+                codename: 'stretch',
+                id: 'Debian',
+              },
+            },
+            'apt_update_last_success': factval,
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
@@ -70,13 +124,21 @@ describe 'apt::update', type: :class do
         end
       end
     end
-    context 'when $::apt_update_last_success is nil' do
+    context 'when $apt_update_last_success is nil' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          osfamily: 'Debian',
-          lsbdistcodename: 'jessie',
+          os: {
+            family: 'Debian',
+            name: 'Debian',
+            release: {
+              major: '9',
+              full: '9.0',
+            },
+            distro: {
+              codename: 'stretch',
+              id: 'Debian',
+            },
+          },
         }
       end
       let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
@@ -90,14 +152,22 @@ describe 'apt::update', type: :class do
   ['daily', 'weekly'].each do |update_frequency|
     context "when apt::update['frequency'] has the value of #{update_frequency}" do
       { 'we are due for a run' => 1_406_660_561, 'the update-success-stamp file does not exist' => -1 }.each_pair do |desc, factval|
-        context "when $::apt_update_last_success indicates #{desc}" do
+        context "when $apt_update_last_success indicates #{desc}" do
           let(:facts) do
             {
-              os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-              lsbdistid: 'Debian',
-              osfamily: 'Debian',
-              apt_update_last_success: factval,
-              lsbdistcodename: 'jessie',
+              os: {
+                family: 'Debian',
+                name: 'Debian',
+                release: {
+                  major: '9',
+                  full: '9.0',
+                },
+                distro: {
+                  codename: 'stretch',
+                  id: 'Debian',
+                },
+              },
+              'apt_update_last_success': factval,
             }
           end
           let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
@@ -108,14 +178,22 @@ describe 'apt::update', type: :class do
           end
         end
       end
-      context 'when the $::apt_update_last_success fact has a recent value' do
+      context 'when the $apt_update_last_success fact has a recent value' do
         let(:facts) do
           {
-            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-            lsbdistid: 'Debian',
-            osfamily: 'Debian',
-            lsbdistcodename: 'jessie',
-            apt_update_last_success: Time.now.to_i,
+            os: {
+              family: 'Debian',
+              name: 'Debian',
+              release: {
+                major: '9',
+                full: '9.0',
+              },
+              distro: {
+                codename: 'stretch',
+                id: 'Debian',
+              },
+            },
+            'apt_update_last_success': Time.now.to_i,
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
@@ -125,14 +203,22 @@ describe 'apt::update', type: :class do
           is_expected.to contain_exec('apt_update').with('refreshonly' => true)
         end
       end
-      context 'when $::apt_update_last_success is nil' do
+      context 'when $apt_update_last_success is nil' do
         let(:facts) do
           {
-            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-            lsbdistid: 'Debian',
-            osfamily: 'Debian',
-            lsbdistcodename: 'jessie',
-            apt_update_last_success: nil,
+            os: {
+              family: 'Debian',
+              name: 'Debian',
+              release: {
+                major: '9',
+                full: '9.0',
+              },
+              distro: {
+                codename: 'stretch',
+                id: 'Debian',
+              },
+            },
+            'apt_update_last_success': nil,
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }