X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_update_spec.rb;h=c6336a9151c943347f4029eff026dc7a881cedbc;hb=3f2b1e3ff0ac3bb11526d61d935483e3a2d7d89b;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..c6336a9 100644
--- a/spec/classes/apt_update_spec.rb
+++ b/spec/classes/apt_update_spec.rb
@@ -12,11 +12,19 @@ describe 'apt::update', type: :class 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',
+            os: {
+              family: 'Debian',
+              name: 'Debian',
+              release: {
+                major: '8',
+                full: '8.0',
+              },
+              distro: {
+                codename: 'jessie',
+                id: 'Debian',
+              },
+            },
             apt_update_last_success: factval,
-            lsbdistcodename: 'jessie',
           }
         end
         let(:pre_condition) do
@@ -32,10 +40,18 @@ describe 'apt::update', type: :class 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: '8',
+              full: '8.0',
+            },
+            distro: {
+              codename: 'jessie',
+              id: 'Debian',
+            },
+          },
         }
       end
       let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'always' },}" }
@@ -55,11 +71,19 @@ describe 'apt::update', type: :class 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',
+            os: {
+              family: 'Debian',
+              name: 'Debian',
+              release: {
+                major: '8',
+                full: '8.0',
+              },
+              distro: {
+                codename: 'jessie',
+                id: 'Debian',
+              },
+            },
             apt_update_last_success: factval,
-            lsbdistcodename: 'jessie',
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
@@ -73,10 +97,18 @@ describe 'apt::update', type: :class 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: '8',
+              full: '8.0',
+            },
+            distro: {
+              codename: 'jessie',
+              id: 'Debian',
+            },
+          },
         }
       end
       let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
@@ -93,11 +125,19 @@ describe 'apt::update', type: :class 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',
+              os: {
+                family: 'Debian',
+                name: 'Debian',
+                release: {
+                  major: '8',
+                  full: '8.0',
+                },
+                distro: {
+                  codename: 'jessie',
+                  id: 'Debian',
+                },
+              },
               apt_update_last_success: factval,
-              lsbdistcodename: 'jessie',
             }
           end
           let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
@@ -111,10 +151,18 @@ describe 'apt::update', type: :class 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',
+            os: {
+              family: 'Debian',
+              name: 'Debian',
+              release: {
+                major: '8',
+                full: '8.0',
+              },
+              distro: {
+                codename: 'jessie',
+                id: 'Debian',
+              },
+            },
             apt_update_last_success: Time.now.to_i,
           }
         end
@@ -128,10 +176,18 @@ describe 'apt::update', type: :class 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: '8',
+                full: '8.0',
+              },
+              distro: {
+                codename: 'jessie',
+                id: 'Debian',
+              },
+            },
             apt_update_last_success: nil,
           }
         end