X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_spec.rb;h=f93770e234d004547608cf05e31c7c55aa43557e;hb=1c17887e79e82aad54da47550e953591b56ef212;hp=fb84c51cfbfe504ea21597f60c37e49305f85018;hpb=438a48a21f416c4a5202160e7d2d4775c6e6739b;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index fb84c51..f93770e 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -35,7 +35,7 @@ preferences_d = { ensure: 'directory',
 describe 'apt' do
   let(:facts) do
     {
-      os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
       lsbdistid: 'Debian',
       osfamily: 'Debian',
       lsbdistcodename: 'wheezy',
@@ -43,7 +43,7 @@ describe 'apt' do
     }
   end
 
-  context 'defaults' do
+  context 'with defaults' do
     it {
       is_expected.to contain_file('sources.list').that_notifies('Class[Apt::Update]').only_with(sources_list)
     }
@@ -60,6 +60,8 @@ describe 'apt' do
       is_expected.to contain_file('preferences.d').that_notifies('Class[Apt::Update]').only_with(preferences_d)
     }
 
+    it { is_expected.to contain_file('/etc/apt/auth.conf').with_ensure('absent') }
+
     it 'lays down /etc/apt/apt.conf.d/15update-stamp' do
       is_expected.to contain_file('/etc/apt/apt.conf.d/15update-stamp').with(group: 'root',
                                                                              mode: '0644',
@@ -76,7 +78,7 @@ describe 'apt' do
   end
 
   describe 'proxy=' do
-    context 'host=localhost' do
+    context 'when host=localhost' do
       let(:params) { { proxy: { 'host' => 'localhost' } } }
 
       it {
@@ -88,7 +90,7 @@ describe 'apt' do
       }
     end
 
-    context 'host=localhost and port=8180' do
+    context 'when host=localhost and port=8180' do
       let(:params) { { proxy: { 'host' => 'localhost', 'port' => 8180 } } }
 
       it {
@@ -100,7 +102,7 @@ describe 'apt' do
       }
     end
 
-    context 'host=localhost and https=true' do
+    context 'when host=localhost and https=true' do
       let(:params) { { proxy: { 'host' => 'localhost', 'https' => true } } }
 
       it {
@@ -112,7 +114,7 @@ describe 'apt' do
       }
     end
 
-    context 'host=localhost and direct=true' do
+    context 'when host=localhost and direct=true' do
       let(:params) { { proxy: { 'host' => 'localhost', 'direct' => true } } }
 
       it {
@@ -124,7 +126,7 @@ describe 'apt' do
       }
     end
 
-    context 'host=localhost and https=true and direct=true' do
+    context 'when host=localhost and https=true and direct=true' do
       let(:params) { { proxy: { 'host' => 'localhost', 'https' => true, 'direct' => true } } }
 
       it {
@@ -143,7 +145,7 @@ describe 'apt' do
       }
     end
 
-    context 'ensure=absent' do
+    context 'when ensure=absent' do
       let(:params) { { proxy: { 'ensure' => 'absent' } } }
 
       it {
@@ -152,7 +154,7 @@ describe 'apt' do
       }
     end
   end
-  context 'lots of non-defaults' do
+  context 'with lots of non-defaults' do
     let :params do
       {
         update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
@@ -186,13 +188,59 @@ describe 'apt' do
     }
   end
 
+  context 'with entries for /etc/apt/auth.conf' do
+    let(:params) do
+      {
+        auth_conf_entries: [
+          { machine: 'deb.example.net',
+            login: 'foologin',
+            password: 'secret' },
+          { machine: 'apt.example.com',
+            login: 'aptlogin',
+            password: 'supersecret' },
+        ],
+      }
+    end
+
+    auth_conf_content = "// This file is managed by Puppet. DO NOT EDIT.
+machine deb.example.net login foologin password secret
+machine apt.example.com login aptlogin password supersecret
+"
+
+    it {
+      is_expected.to contain_file('/etc/apt/auth.conf').with(ensure: 'present',
+                                                             owner: 'root',
+                                                             group: 'root',
+                                                             mode: '0600',
+                                                             notify: 'Class[Apt::Update]',
+                                                             content: auth_conf_content)
+    }
+  end
+
+  context 'with improperly specified entries for /etc/apt/auth.conf' do
+    let(:params) do
+      {
+        auth_conf_entries: [
+          { machinn: 'deb.example.net',
+            username: 'foologin',
+            password: 'secret' },
+          { machine: 'apt.example.com',
+            login: 'aptlogin',
+            password: 'supersecret' },
+        ],
+      }
+    end
+
+    it { is_expected.to raise_error(Puppet::Error) }
+  end
+
   context 'with sources defined on valid osfamily' do
     let :facts do
-      { os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04' } },
+      { os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenial',
         lsbdistid: 'Ubuntu',
-        lsbdistrelease: '12.04',
+        lsbdistrelease: '16.04',
         puppetversion: Puppet.version }
     end
     let(:params) do
@@ -224,15 +272,15 @@ describe 'apt' do
       is_expected.to contain_apt__setting('list-puppetlabs').with(ensure: 'present')
     }
 
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com precise main$}) }
+    it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com xenial main$}) }
   end
 
   context 'with confs defined on valid osfamily' do
     let :facts do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenial',
         lsbdistid: 'Debian',
         puppetversion: Puppet.version,
       }
@@ -260,9 +308,9 @@ describe 'apt' do
   context 'with keys defined on valid osfamily' do
     let :facts do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenial',
         lsbdistid: 'Debian',
         puppetversion: Puppet.version,
       }
@@ -290,11 +338,11 @@ describe 'apt' do
   context 'with ppas defined on valid osfamily' do
     let :facts do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenial',
         lsbdistid: 'ubuntu',
-        lsbdistrelease: '12.04',
+        lsbdistrelease: '16.04',
         puppetversion: Puppet.version,
       }
     end
@@ -312,9 +360,9 @@ describe 'apt' do
   context 'with settings defined on valid osfamily' do
     let :facts do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenial',
         lsbdistid: 'Debian',
         puppetversion: Puppet.version,
       }
@@ -333,9 +381,9 @@ describe 'apt' do
   context 'with pins defined on valid osfamily' do
     let :facts do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenial',
         lsbdistid: 'Debian',
         puppetversion: Puppet.version,
       }
@@ -352,7 +400,7 @@ describe 'apt' do
   end
 
   describe 'failing tests' do
-    context "purge['sources.list']=>'banana'" do
+    context "with purge['sources.list']=>'banana'" do
       let(:params) { { purge: { 'sources.list' => 'banana' } } }
 
       it do
@@ -360,7 +408,7 @@ describe 'apt' do
       end
     end
 
-    context "purge['sources.list.d']=>'banana'" do
+    context "with purge['sources.list.d']=>'banana'" do
       let(:params) { { purge: { 'sources.list.d' => 'banana' } } }
 
       it do
@@ -368,7 +416,7 @@ describe 'apt' do
       end
     end
 
-    context "purge['preferences']=>'banana'" do
+    context "with purge['preferences']=>'banana'" do
       let(:params) { { purge: { 'preferences' => 'banana' } } }
 
       it do
@@ -376,7 +424,7 @@ describe 'apt' do
       end
     end
 
-    context "purge['preferences.d']=>'banana'" do
+    context "with purge['preferences.d']=>'banana'" do
       let(:params) { { purge: { 'preferences.d' => 'banana' } } }
 
       it do