X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Facceptance%2Fapt_spec.rb;h=5c389e3eeb0e79a227e61cfeb67fa90264ae32f3;hb=4a39afa703839ffd6475cafa307e06fb8eb58408;hp=3011f9dfdec6a56aecd5837f738046ee68461f1d;hpb=5d96da0c6aac8f0f9192fe6ce63548bdaee149b5;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb index 3011f9d..5c389e3 100644 --- a/spec/acceptance/apt_spec.rb +++ b/spec/acceptance/apt_spec.rb @@ -11,25 +11,34 @@ describe 'apt class' do context 'all the things' 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 => { + if $::lsbdistcodename == 'lucid' { + $sources = undef + } else { + $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' => 'hkps.pool.sks-keyservers.net', + }, + }, + } + } + class { 'apt': + update => { + 'frequency' => 'always', + 'timeout' => '400', + 'tries' => '3', + }, + purge => { + 'sources.list' => true, + 'sources.list.d' => true, + 'preferences' => true, + 'preferences.d' => true, }, - fancy_progress => true, + sources => $sources, } EOS