Merge remote-tracking branch 'upstream/master' into merge_master_to_next

[puppet-modules/puppetlabs-apt.git] / spec / acceptance / apt_spec.rb

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
index 3011f9dfdec6a56aecd5837f738046ee68461f1d..c948df2ac22bd2599c9d30cca9659992d69c62f4 100644 (file)
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -12,24 +12,28 @@ describe 'apt class' do
     it 'should work with no errors' do
       pp = <<-EOS
       class { 'apt':
-        always_apt_update    => true,
-        disable_keys         => true,
-        purge_sources_list   => true,
-        purge_sources_list_d => true,
-        purge_preferences    => true,
-        purge_preferences_d  => true,
-        update_timeout       => '400',
-        update_tries         => '3',
-        sources              => {
+        update => {
+          'frequency' => 'always',
+          'timeout'   => '400',
+          'tries'     => '3',
+        },
+        purge => {
+          'sources.list'   => true,
+          'sources.list.d' => true,
+          'preferences'    => true,
+          'preferences.d'  => true,
+        },
+        sources => {
           'puppetlabs' => {
-            'ensure'     => present,
-            'location'   => 'http://apt.puppetlabs.com',
-            'repos'      => 'main',
-            'key'        => '4BD6EC30',
-            'key_server' => 'pgp.mit.edu',
-          }
+            'ensure'   => present,
+            'location' => 'http://apt.puppetlabs.com',
+            'repos'    => 'main',
+            'key'      => {
+              'id'     => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+              'server' => 'pgp.mit.edu',
+            },
+          },
         },
-        fancy_progress       => true,
       }
       EOS