X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_spec.rb;h=b92f7ddabc3c60e136739a0b42f2aa44c000cde3;hb=59c362a2c13619278977087521c81aa20169cbca;hp=2c70e3e0901258b106a7c42e940131b35acf5e1c;hpb=239232bbd44c6dabc3f305bd23b354481d9f8a71;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index 2c70e3e..b92f7dd 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -31,17 +31,13 @@ describe 'apt', :type => :class do
       'recurse' => false,
     })}
 
-    it { should contain_file('01proxy').that_notifies('Exec[apt_update]').only_with({
-      'ensure' => 'absent',
-      'path'   => '/etc/apt/apt.conf.d/01proxy',
-      'notify' => 'Exec[apt_update]',
-    })}
-
-    it { should contain_file('old-proxy-file').that_notifies('Exec[apt_update]').only_with({
-      'ensure' => 'absent',
-      'path'   => '/etc/apt/apt.conf.d/proxy',
-      'notify' => 'Exec[apt_update]',
-    })}
+    it 'should lay down /etc/apt/apt.conf.d/15update-stamp' do
+      should contain_file('/etc/apt/apt.conf.d/15update-stamp').with({
+        'group' => 'root',
+        'mode'  => '0644',
+        'owner' => 'root',
+      }).with_content(/APT::Update::Post-Invoke-Success \{"touch \/var\/lib\/apt\/periodic\/update-success-stamp 2>\/dev\/null \|\| true";\};/)
+    end
 
     it { should contain_exec('apt_update').with({
       'refreshonly' => 'true',
@@ -52,16 +48,12 @@ describe 'apt', :type => :class do
     let :params do
       {
         :always_apt_update    => true,
-        :disable_keys         => true,
-        :proxy_host           => 'foo',
-        :proxy_port           => '9876',
         :purge_sources_list   => true,
         :purge_sources_list_d => true,
         :purge_preferences    => true,
         :purge_preferences_d  => true,
         :update_timeout       => '1',
         :update_tries         => '3',
-        :fancy_progress       => true,
       }
     end
 
@@ -84,28 +76,6 @@ describe 'apt', :type => :class do
       'recurse' => 'true',
     })}
 
-    it { should contain_file('99progressbar').only_with({
-      'ensure'  => 'present',
-      'content' => 'Dpkg::Progress-Fancy "1";',
-      'path'    => '/etc/apt/apt.conf.d/99progressbar',
-    })}
-
-    it { should contain_file('99unauth').only_with({
-      'ensure'  => 'present',
-      'content' => "APT::Get::AllowUnauthenticated 1;\n",
-      'path'    => '/etc/apt/apt.conf.d/99unauth',
-    })}
-
-    it { should contain_file('01proxy').that_notifies('Exec[apt_update]').only_with({
-      'ensure'  => 'present',
-      'path'    => '/etc/apt/apt.conf.d/01proxy',
-      'content' => "Acquire::http::Proxy \"http://foo:9876\";\n",
-      'notify'  => 'Exec[apt_update]',
-      'mode'    => '0644',
-      'owner'   => 'root',
-      'group'   => 'root'
-    })}
-
     it { should contain_exec('apt_update').with({
       'refreshonly' => 'false',
       'timeout'     => '1',
@@ -114,26 +84,6 @@ describe 'apt', :type => :class do
 
   end
 
-  context 'more non-default' do
-    let :params do
-      {
-        :fancy_progress => false,
-        :disable_keys   => false,
-      }
-    end
-
-    it { should contain_file('99progressbar').only_with({
-      'ensure'  => 'absent',
-      'path'    => '/etc/apt/apt.conf.d/99progressbar',
-    })}
-
-    it { should contain_file('99unauth').only_with({
-      'ensure'  => 'absent',
-      'path'    => '/etc/apt/apt.conf.d/99unauth',
-    })}
-
-  end
-
   context 'with sources defined on valid osfamily' do
     let :facts do
       { :osfamily        => 'Debian',
@@ -146,7 +96,6 @@ describe 'apt', :type => :class do
         'location'          => 'http://debian.mirror.iweb.ca/debian/',
         'release'           => 'unstable',
         'repos'             => 'main contrib non-free',
-        'required_packages' => 'debian-keyring debian-archive-keyring',
         'key'               => '55BE302B',
         'key_server'        => 'subkeys.pgp.net',
         'pin'               => '-10',