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

View file

@ -12,21 +12,27 @@ describe 'apt class' do
it 'should work with no errors' do it 'should work with no errors' do
pp = <<-EOS pp = <<-EOS
class { 'apt': class { 'apt':
always_apt_update => true, update => {
purge_sources_list => true, 'frequency' => 'always',
purge_sources_list_d => true, 'timeout' => '400',
purge_preferences => true, 'tries' => '3',
purge_preferences_d => true, },
update_timeout => '400', purge => {
update_tries => '3', 'sources.list' => true,
sources => { 'sources.list.d' => true,
'preferences' => true,
'preferences.d' => true,
},
sources => {
'puppetlabs' => { 'puppetlabs' => {
'ensure' => present, 'ensure' => present,
'location' => 'http://apt.puppetlabs.com', 'location' => 'http://apt.puppetlabs.com',
'repos' => 'main', 'repos' => 'main',
'key' => '4BD6EC30', 'key' => {
'key_server' => 'pgp.mit.edu', 'id' => '4BD6EC30',
} 'server' => 'pgp.mit.edu',
},
},
}, },
} }
EOS EOS