X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_backports_spec.rb;h=2f3865bc32c8ade2aaa27c97791c77b80e45897e;hb=3f2b1e3ff0ac3bb11526d61d935483e3a2d7d89b;hp=57e8a060a219b09f1234b48e21aed78e23b2106d;hpb=c5259f83ad20d120d502d8541c75f4ee6021fec8;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb
index 57e8a06..2f3865b 100644
--- a/spec/classes/apt_backports_spec.rb
+++ b/spec/classes/apt_backports_spec.rb
@@ -9,10 +9,18 @@ describe 'apt::backports', type: :class do
     context 'with defaults on deb' 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
 
@@ -26,11 +34,18 @@ describe 'apt::backports', type: :class do
     context 'with defaults on ubuntu' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-          lsbdistid: 'Ubuntu',
-          osfamily: 'Debian',
-          lsbdistcodename: 'xenial',
-          lsbdistrelease: '16.04',
+          os: {
+            family: 'Debian',
+            name: 'Ubuntu',
+            release: {
+              major: '16',
+              full: '16.04',
+            },
+            distro: {
+              codename: 'xenial',
+              id: 'Ubuntu',
+            },
+          },
         }
       end
 
@@ -45,11 +60,18 @@ describe 'apt::backports', type: :class do
     context 'with everything set' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-          lsbdistid: 'Ubuntu',
-          osfamily: 'Debian',
-          lsbdistcodename: 'xenial',
-          lsbdistrelease: '16.04',
+          os: {
+            family: 'Debian',
+            name: 'Ubuntu',
+            release: {
+              major: '16',
+              full: '16.04',
+            },
+            distro: {
+              codename: 'xenial',
+              id: 'Ubuntu',
+            },
+          },
         }
       end
       let(:params) do
@@ -73,11 +95,18 @@ describe 'apt::backports', type: :class do
     context 'when set things with hashes' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-          lsbdistid: 'Ubuntu',
-          osfamily: 'Debian',
-          lsbdistcodename: 'xenial',
-          lsbdistrelease: '16.04',
+          os: {
+            family: 'Debian',
+            name: 'Ubuntu',
+            release: {
+              major: '16',
+              full: '16.04',
+            },
+            distro: {
+              codename: 'xenial',
+              id: 'Ubuntu',
+            },
+          },
         }
       end
       let(:params) do
@@ -100,10 +129,18 @@ describe 'apt::backports', type: :class do
   describe 'mint tests' do
     let(:facts) do
       {
-        os: { family: 'Debian', name: 'Linuxmint', release: { major: '17', full: '17' } },
-        lsbdistid: 'linuxmint',
-        osfamily: 'Debian',
-        lsbdistcodename: 'qiana',
+        os: {
+          family: 'Debian',
+          name: 'LinuxMint',
+          release: {
+            major: '17',
+            full: '17',
+          },
+          distro: {
+            codename: 'qiana',
+            id: 'LinuxMint',
+          },
+        },
       }
     end
 
@@ -181,11 +218,18 @@ describe 'apt::backports', type: :class do
   describe 'validation' do
     let(:facts) do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-        lsbdistid: 'Ubuntu',
-        osfamily: 'Debian',
-        lsbdistcodename: 'xenial',
-        lsbdistrelease: '16.04',
+        os: {
+          family: 'Debian',
+          name: 'Ubuntu',
+          release: {
+            major: '16',
+            full: '16.04',
+          },
+          distro: {
+            codename: 'xenial',
+            id: 'Ubuntu',
+          },
+        },
       }
     end