Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a09dcaf
)
hashes are not supported in selectors
author
Morgan Haskel
<morgan@puppetlabs.com>
Wed, 17 Jun 2015 21:56:22 +0000
(14:56 -0700)
committer
Morgan Haskel
<morgan@puppetlabs.com>
Wed, 17 Jun 2015 21:56:22 +0000
(14:56 -0700)
spec/acceptance/apt_spec.rb
patch
|
blob
|
history
diff --git
a/spec/acceptance/apt_spec.rb
b/spec/acceptance/apt_spec.rb
index 843dd0a83d4ed8cc7b5aa82196648ead7216c1e8..d3bd76174ce8440e6907aff236983075c98af05e 100644
(file)
--- a/
spec/acceptance/apt_spec.rb
+++ b/
spec/acceptance/apt_spec.rb
@@
-11,6
+11,21
@@
describe 'apt class' do
context 'all the things' do
it 'should work with no errors' do
pp = <<-EOS
context 'all the things' do
it 'should work with no errors' do
pp = <<-EOS
+ if $::lsbdistcodename == 'lucid' {
+ $sources = undef
+ } else {
+ $sources = {
+ 'puppetlabs' => {
+ 'ensure' => present,
+ 'location' => 'http://apt.puppetlabs.com',
+ 'repos' => 'main',
+ 'key' => {
+ 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+ 'server' => 'pgp.mit.edu',
+ },
+ },
+ }
+ }
class { 'apt':
update => {
'frequency' => 'always',
class { 'apt':
update => {
'frequency' => 'always',
@@
-23,19
+38,7
@@
describe 'apt class' do
'preferences' => true,
'preferences.d' => true,
},
'preferences' => true,
'preferences.d' => true,
},
- sources => $::lsbdiscodename ? {
- 'lucid' => undef,
- default => { 'puppetlabs' => {
- 'ensure' => present,
- 'location' => 'http://apt.puppetlabs.com',
- 'repos' => 'main',
- 'key' => {
- 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
- 'server' => 'pgp.mit.edu',
- },
- },
- },
- },
+ sources => $sources,
}
EOS
}
EOS