Make the acceptance tests work

This commit is contained in:
Morgan Haskel 2015-03-18 12:56:29 -07:00
parent c7354b90fb
commit f5c6775564
2 changed files with 27 additions and 21 deletions

View file

@ -488,14 +488,14 @@ ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
end
end
describe 'keyserver_options =>' do
describe 'options =>' do
context 'debug' do
it 'works' do
pp = <<-EOS
apt_key { 'puppetlabs':
id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
ensure => 'present',
keyserver_options => 'debug',
id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
ensure => 'present',
options => 'debug',
}
EOS
@ -507,9 +507,9 @@ ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
it 'fails on invalid options' do
pp = <<-EOS
apt_key { 'puppetlabs':
id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
ensure => 'present',
keyserver_options => 'this is totally bonkers',
id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
ensure => 'present',
options => 'this is totally bonkers',
}
EOS

View file

@ -12,21 +12,27 @@ describe 'apt class' do
it 'should work with no errors' do
pp = <<-EOS
class { 'apt':
always_apt_update => 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' => '4BD6EC30',
'server' => 'pgp.mit.edu',
},
},
},
}
EOS