Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #524 from mhaskel/better_defined_check
[puppet-modules/puppetlabs-apt.git]
/
spec
/
classes
/
apt_spec.rb
diff --git
a/spec/classes/apt_spec.rb
b/spec/classes/apt_spec.rb
index e668996f5b9e9edde5fd52ec2f0dd4e421cf7e5c..1c8cac7a03c27fd5ee43a9b7e70a816420809d38 100644
(file)
--- a/
spec/classes/apt_spec.rb
+++ b/
spec/classes/apt_spec.rb
@@
-1,6
+1,6
@@
require 'spec_helper'
describe 'apt' do
require 'spec_helper'
describe 'apt' do
- let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy'} }
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy'
, :puppetversion => Puppet.version
} }
context 'defaults' do
it { is_expected.to contain_file('sources.list').that_notifies('Exec[apt_update]').only_with({
context 'defaults' do
it { is_expected.to contain_file('sources.list').that_notifies('Exec[apt_update]').only_with({
@@
-9,7
+9,6
@@
describe 'apt' do
:owner => 'root',
:group => 'root',
:mode => '0644',
:owner => 'root',
:group => 'root',
:mode => '0644',
- :content => "# Repos managed by puppet.\n",
:notify => 'Exec[apt_update]',
})}
:notify => 'Exec[apt_update]',
})}
@@
-19,13
+18,13
@@
describe 'apt' do
:owner => 'root',
:group => 'root',
:mode => '0644',
:owner => 'root',
:group => 'root',
:mode => '0644',
- :purge =>
tru
e,
- :recurse =>
tru
e,
+ :purge =>
fals
e,
+ :recurse =>
fals
e,
:notify => 'Exec[apt_update]',
})}
it { is_expected.to contain_file('preferences').that_notifies('Exec[apt_update]').only_with({
:notify => 'Exec[apt_update]',
})}
it { is_expected.to contain_file('preferences').that_notifies('Exec[apt_update]').only_with({
- :ensure => '
absent
',
+ :ensure => '
file
',
:path => '/etc/apt/preferences',
:owner => 'root',
:group => 'root',
:path => '/etc/apt/preferences',
:owner => 'root',
:group => 'root',
@@
-39,8
+38,8
@@
describe 'apt' do
:owner => 'root',
:group => 'root',
:mode => '0644',
:owner => 'root',
:group => 'root',
:mode => '0644',
- :purge =>
tru
e,
- :recurse =>
tru
e,
+ :purge =>
fals
e,
+ :recurse =>
fals
e,
:notify => 'Exec[apt_update]',
})}
:notify => 'Exec[apt_update]',
})}
@@
-96,14
+95,14
@@
describe 'apt' do
context 'lots of non-defaults' do
let :params do
{
context 'lots of non-defaults' do
let :params do
{
- :update => { '
always' => true
, 'timeout' => 1, 'tries' => 3 },
+ :update => { '
frequency' => 'always'
, 'timeout' => 1, 'tries' => 3 },
:purge => { 'sources.list' => false, 'sources.list.d' => false,
'preferences' => false, 'preferences.d' => false, },
}
end
:purge => { 'sources.list' => false, 'sources.list.d' => false,
'preferences' => false, 'preferences.d' => false, },
}
end
- it { is_expected.to contain_file('sources.list').with
out
({
- :content =>
"# Repos managed by puppet.\n"
,
+ it { is_expected.to contain_file('sources.list').with({
+ :content =>
nil
,
})}
it { is_expected.to contain_file('sources.list.d').with({
})}
it { is_expected.to contain_file('sources.list.d').with({
@@
-133,6
+132,7
@@
describe 'apt' do
{ :osfamily => 'Debian',
:lsbdistcodename => 'precise',
:lsbdistid => 'Debian',
{ :osfamily => 'Debian',
:lsbdistcodename => 'precise',
:lsbdistid => 'Debian',
+ :puppetversion => Puppet.version,
}
end
let(:params) { { :sources => {
}
end
let(:params) { { :sources => {
@@
-140,14
+140,14
@@
describe 'apt' do
'location' => 'http://debian.mirror.iweb.ca/debian/',
'release' => 'unstable',
'repos' => 'main contrib non-free',
'location' => 'http://debian.mirror.iweb.ca/debian/',
'release' => 'unstable',
'repos' => 'main contrib non-free',
- 'key' => { 'id' => '55BE302B', 'server' => 'subkeys.pgp.net' },
+ 'key' => { 'id' => '
150C8614919D8446E01E83AF9AA38DCD
55BE302B', 'server' => 'subkeys.pgp.net' },
'pin' => '-10',
'pin' => '-10',
- 'include
_src' => true
,
+ 'include
' => {'src' => true,}
,
},
'puppetlabs' => {
'location' => 'http://apt.puppetlabs.com',
'repos' => 'main',
},
'puppetlabs' => {
'location' => 'http://apt.puppetlabs.com',
'repos' => 'main',
- 'key' => { 'id' => '4BD6EC30', 'server' => 'pgp.mit.edu' },
+ 'key' => { 'id' => '4
7B320EB4C7C375AA9DAE1A01054B7A24
BD6EC30', 'server' => 'pgp.mit.edu' },
}
} } }
}
} } }
@@
-174,6
+174,7
@@
describe 'apt' do
{ :osfamily => 'Debian',
:lsbdistcodename => 'precise',
:lsbdistid => 'Debian',
{ :osfamily => 'Debian',
:lsbdistcodename => 'precise',
:lsbdistid => 'Debian',
+ :puppetversion => Puppet.version,
}
end
let(:params) { { :keys => {
}
end
let(:params) { { :keys => {
@@
-199,6
+200,7
@@
describe 'apt' do
{ :osfamily => 'Debian',
:lsbdistcodename => 'precise',
:lsbdistid => 'ubuntu',
{ :osfamily => 'Debian',
:lsbdistcodename => 'precise',
:lsbdistid => 'ubuntu',
+ :puppetversion => Puppet.version,
}
end
let(:params) { { :ppas => {
}
end
let(:params) { { :ppas => {
@@
-215,6
+217,7
@@
describe 'apt' do
{ :osfamily => 'Debian',
:lsbdistcodename => 'precise',
:lsbdistid => 'Debian',
{ :osfamily => 'Debian',
:lsbdistcodename => 'precise',
:lsbdistid => 'Debian',
+ :puppetversion => Puppet.version,
}
end
let(:params) { { :settings => {
}
end
let(:params) { { :settings => {
@@
-231,7
+234,7
@@
describe 'apt' do
let(:params) { { :purge => { 'sources.list' => 'banana' }, } }
it do
expect {
let(:params) { { :purge => { 'sources.list' => 'banana' }, } }
it do
expect {
- is_expected.to compile
+ subject.call
}.to raise_error(Puppet::Error)
end
end
}.to raise_error(Puppet::Error)
end
end
@@
-240,7
+243,7
@@
describe 'apt' do
let(:params) { { :purge => { 'sources.list.d' => 'banana' }, } }
it do
expect {
let(:params) { { :purge => { 'sources.list.d' => 'banana' }, } }
it do
expect {
- is_expected.to compile
+ subject.call
}.to raise_error(Puppet::Error)
end
end
}.to raise_error(Puppet::Error)
end
end
@@
-249,7
+252,7
@@
describe 'apt' do
let(:params) { { :purge => { 'preferences' => 'banana' }, } }
it do
expect {
let(:params) { { :purge => { 'preferences' => 'banana' }, } }
it do
expect {
- is_expected.to compile
+ subject.call
}.to raise_error(Puppet::Error)
end
end
}.to raise_error(Puppet::Error)
end
end
@@
-258,19
+261,19
@@
describe 'apt' do
let(:params) { { :purge => { 'preferences.d' => 'banana' }, } }
it do
expect {
let(:params) { { :purge => { 'preferences.d' => 'banana' }, } }
it do
expect {
- is_expected.to compile
+ subject.call
}.to raise_error(Puppet::Error)
end
end
context 'with unsupported osfamily' do
let :facts do
}.to raise_error(Puppet::Error)
end
end
context 'with unsupported osfamily' do
let :facts do
- { :osfamily => 'Darwin', }
+ { :osfamily => 'Darwin',
:puppetversion => Puppet.version,
}
end
it do
expect {
end
it do
expect {
- is_expected.to compile
+ subject.call
}.to raise_error(Puppet::Error, /This module only works on Debian or derivatives like Ubuntu/)
end
end
}.to raise_error(Puppet::Error, /This module only works on Debian or derivatives like Ubuntu/)
end
end