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
fix check of release parameter
[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 e93137e8e4e32a1ece8895f63a38e933b6445272..0f37f6367bcbd761d966fe448caf18ea9dd71163 100644
(file)
--- a/
spec/defines/source_spec.rb
+++ b/
spec/defines/source_spec.rb
@@
-6,6
+6,7
@@
describe 'apt::source', :type => :define do
let :default_params do
{
let :default_params do
{
+ :ensure => 'present',
:location => '',
:release => 'karmic',
:repos => 'main',
:location => '',
:release => 'karmic',
:repos => 'main',
@@
-21,7
+22,7
@@
describe 'apt::source', :type => :define do
[{},
{
[{},
{
- :location => '
somewhere
',
+ :location => '
http://example.com
',
:release => 'precise',
:repos => 'security',
:include_src => false,
:release => 'precise',
:repos => 'security',
:include_src => false,
@@
-35,6
+36,18
@@
describe 'apt::source', :type => :define do
:key => 'key_name',
:key_server => 'keyserver.debian.com',
:key_content => false,
:key => 'key_name',
:key_server => 'keyserver.debian.com',
:key_content => false,
+ },
+ {
+ :ensure => 'absent',
+ :location => 'http://example.com',
+ :release => 'precise',
+ :repos => 'security',
+ },
+ {
+ :release => '',
+ },
+ {
+ :release => 'custom',
}
].each do |param_set|
describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
}
].each do |param_set|
describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
@@
-66,23
+79,23
@@
describe 'apt::source', :type => :define do
it { should contain_apt__params }
it { should contain_file("#{title}.list").with({
it { should contain_apt__params }
it { should contain_file("#{title}.list").with({
+ 'ensure' => param_hash[:ensure],
'path' => filename,
'path' => filename,
- 'ensure' => "file",
- 'owner' => "root",
- 'group' => "root",
- 'mode' => 644,
- 'content' => content
+ 'owner' => 'root',
+ 'group' => 'root',
+ 'mode' => '0644',
+ 'content' => content,
})
}
it {
if param_hash[:pin]
})
}
it {
if param_hash[:pin]
- should contain_apt__pin(
param_hash[:release]
).with({
+ should contain_apt__pin(
title
).with({
"priority" => param_hash[:pin],
"before" => "File[#{title}.list]"
})
else
"priority" => param_hash[:pin],
"before" => "File[#{title}.list]"
})
else
- should_not contain_apt__pin(
param_hash[:release]
).with({
+ should_not contain_apt__pin(
title
).with({
"priority" => param_hash[:pin],
"before" => "File[#{title}.list]"
})
"priority" => param_hash[:pin],
"before" => "File[#{title}.list]"
})
@@
-90,9
+103,8
@@
describe 'apt::source', :type => :define do
}
it {
}
it {
- should contain_exec("
#{title} apt
update").with({
+ should contain_exec("
apt_
update").with({
"command" => "/usr/bin/apt-get update",
"command" => "/usr/bin/apt-get update",
- "subscribe" => "File[#{title}.list]",
"refreshonly" => true
})
}
"refreshonly" => true
})
}