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
Convert to use apt::setting instead of file resources
[puppet-modules/puppetlabs-apt.git]
/
spec
/
defines
/
source_spec.rb
diff --git
a/spec/defines/source_spec.rb
b/spec/defines/source_spec.rb
index 7a1cac321a0502471dfef8a8497e0d4b5f250c88..ad986e96843b28ac50efe2138d634092908fa608 100644
(file)
--- a/
spec/defines/source_spec.rb
+++ b/
spec/defines/source_spec.rb
@@
-23,15
+23,12
@@
describe 'apt::source', :type => :define do
let :params do
{
'include_deb' => false,
let :params do
{
'include_deb' => false,
+ 'include_src' => true,
}
end
}
end
- it { is_expected.to contain_
file('my_source.list
').that_notifies('Exec[apt_update]').with({
+ it { is_expected.to contain_
apt__setting('list-my_source
').that_notifies('Exec[apt_update]').with({
'ensure' => 'present',
'ensure' => 'present',
- 'path' => '/etc/apt/sources.list.d/my_source.list',
- 'owner' => 'root',
- 'group' => 'root',
- 'mode' => '0644',
}).with_content(/# my_source\ndeb-src wheezy main\n/)
}
end
}).with_content(/# my_source\ndeb-src wheezy main\n/)
}
end
@@
-61,23
+58,19
@@
describe 'apt::source', :type => :define do
}
end
}
end
- it { is_expected.to contain_
file('my_source.list
').that_notifies('Exec[apt_update]').with({
+ it { is_expected.to contain_
apt__setting('list-my_source
').that_notifies('Exec[apt_update]').with({
'ensure' => 'present',
'ensure' => 'present',
- 'path' => '/etc/apt/sources.list.d/my_source.list',
- 'owner' => 'root',
- 'group' => 'root',
- 'mode' => '0644',
}).with_content(/# foo\ndeb \[arch=x86_64 trusted=yes\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ sid testing\n/).without_content(/deb-src/)
}
}).with_content(/# foo\ndeb \[arch=x86_64 trusted=yes\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ sid testing\n/).without_content(/deb-src/)
}
- it { is_expected.to contain_apt__pin('my_source').that_comes_before('
File[my_source.list
]').with({
+ it { is_expected.to contain_apt__pin('my_source').that_comes_before('
Apt::Setting[list-my_source
]').with({
'ensure' => 'present',
'priority' => '10',
'origin' => 'debian.mirror.iweb.ca',
})
}
'ensure' => 'present',
'priority' => '10',
'origin' => 'debian.mirror.iweb.ca',
})
}
- it { is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('
File[my_source.list
]').with({
+ it { is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('
Apt::Setting[list-my_source
]').with({
'ensure' => 'present',
'key' => GPG_KEY_ID,
'key_server' => 'pgp.mit.edu',
'ensure' => 'present',
'key' => GPG_KEY_ID,
'key_server' => 'pgp.mit.edu',
@@
-102,12
+95,8
@@
describe 'apt::source', :type => :define do
}
end
}
end
- it { is_expected.to contain_
file('my_source.list
').that_notifies('Exec[apt_update]').with({
+ it { is_expected.to contain_
apt__setting('list-my_source
').that_notifies('Exec[apt_update]').with({
'ensure' => 'present',
'ensure' => 'present',
- 'path' => '/etc/apt/sources.list.d/my_source.list',
- 'owner' => 'root',
- 'group' => 'root',
- 'mode' => '0644',
}).with_content(/# my_source\ndeb \[trusted=yes\] wheezy main\n/)
}
end
}).with_content(/# my_source\ndeb \[trusted=yes\] wheezy main\n/)
}
end
@@
-123,16
+112,13
@@
describe 'apt::source', :type => :define do
let :params do
{
'include_deb' => false,
let :params do
{
'include_deb' => false,
+ 'include_src' => true,
'architecture' => 'x86_64',
}
end
'architecture' => 'x86_64',
}
end
- it { is_expected.to contain_
file('my_source.list
').that_notifies('Exec[apt_update]').with({
+ it { is_expected.to contain_
apt__setting('list-my_source
').that_notifies('Exec[apt_update]').with({
'ensure' => 'present',
'ensure' => 'present',
- 'path' => '/etc/apt/sources.list.d/my_source.list',
- 'owner' => 'root',
- 'group' => 'root',
- 'mode' => '0644',
}).with_content(/# my_source\ndeb-src \[arch=x86_64 \] wheezy main\n/)
}
end
}).with_content(/# my_source\ndeb-src \[arch=x86_64 \] wheezy main\n/)
}
end
@@
-151,7
+137,7
@@
describe 'apt::source', :type => :define do
}
end
}
end
- it { is_expected.to contain_
file('my_source.list
').that_notifies('Exec[apt_update]').with({
+ it { is_expected.to contain_
apt__setting('list-my_source
').that_notifies('Exec[apt_update]').with({
'ensure' => 'absent'
})
}
'ensure' => 'absent'
})
}
@@
-168,7
+154,7
@@
describe 'apt::source', :type => :define do
it do
expect {
it do
expect {
-
should
compile
+
is_expected.to
compile
}.to raise_error(Puppet::Error, /lsbdistcodename fact not available: release parameter required/)
end
end
}.to raise_error(Puppet::Error, /lsbdistcodename fact not available: release parameter required/)
end
end