Merge pull request #740 from bastelfreak/apt2

Adopt to latest puppetlabs/apt changes

Author: joshcooper

Gemfile

@@ -51,7 +51,6 @@ group :development, :release_prep do
   gem "puppetlabs_spec_helper", '~> 7.0', require: false
 end
 group :system_tests do
-  gem "puppet_litmus", '~> 1.0',      require: false, platforms: [:ruby, :x64_mingw]
   gem "CFPropertyList", '< 3.0.7',    require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "serverspec", '~> 2.41',        require: false
   gem "voxpupuli-acceptance", '~> 3', require: false

manifests/osfamily/debian.pp

@@ -60,13 +60,11 @@
         # Pass in an empty content string since apt requires it even though we are removing it
         apt::setting { 'list-puppet-enterprise-installer':
           ensure  => absent,
-          content => '',
         }
 
         apt::setting { 'conf-pe-repo':
           ensure   => absent,
           priority => '90',
-          content  => '',
         }
       } else {
         $source = $puppet_agent::apt_source

spec/classes/puppet_agent_osfamily_debian_spec.rb

@@ -58,16 +58,14 @@
         is_expected.to contain_apt__setting('conf-pe-repo')
           .with({
                   'priority' => 90,
-                  'content'  => '',
                   'ensure'   => 'absent',
                 })
       }
 
       it {
         is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
           .with({
-                  'content' => '',
-                  'ensure'  => 'absent',
+                  'ensure' => 'absent',
                 })
       }
     end