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 branch 'proxy'
[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 812fa123c7d3e9165b1f9a1660bf47b2de1287aa..a66feac78810ce3175580a2dd5ee4b7298fcd2ea 100644
(file)
--- a/
spec/classes/apt_spec.rb
+++ b/
spec/classes/apt_spec.rb
@@
-4,7
+4,8
@@
describe 'apt', :type => :class do
{
:disable_keys => :undef,
:always_apt_update => false,
{
:disable_keys => :undef,
:always_apt_update => false,
- :purge => false
+ :purge_sources_list => false,
+ :purge_sources_list_d => false,
}
end
}
end
@@
-14,7
+15,8
@@
describe 'apt', :type => :class do
:always_apt_update => true,
:proxy_host => true,
:proxy_port => '3128',
:always_apt_update => true,
:proxy_host => true,
:proxy_port => '3128',
- :purge => true
+ :purge_sources_list => true,
+ :purge_sources_list_d => true,
},
{
:disable_keys => false
},
{
:disable_keys => false
@@
-39,16
+41,14
@@
describe 'apt', :type => :class do
it { should include_class("apt::params") }
it { should include_class("apt::params") }
- it { should contain_package("python-software-properties") }
-
it {
it {
- if param_hash[:purge]
+ if param_hash[:purge
_sources_list
]
should contain_file("sources.list").with({
'path' => "/etc/apt/sources.list",
'ensure' => "present",
'owner' => "root",
'group' => "root",
should contain_file("sources.list").with({
'path' => "/etc/apt/sources.list",
'ensure' => "present",
'owner' => "root",
'group' => "root",
- 'mode' =>
644
,
+ 'mode' =>
"0644"
,
"content" => "# Repos managed by puppet.\n"
})
else
"content" => "# Repos managed by puppet.\n"
})
else
@@
-57,20
+57,21
@@
describe 'apt', :type => :class do
'ensure' => "present",
'owner' => "root",
'group' => "root",
'ensure' => "present",
'owner' => "root",
'group' => "root",
- 'mode' =>
644
,
+ 'mode' =>
"0644"
,
'content' => nil
})
end
}
it {
'content' => nil
})
end
}
it {
- if param_hash[:purge]
+ if param_hash[:purge
_sources_list_d
]
should create_file("sources.list.d").with({
'path' => "/etc/apt/sources.list.d",
'ensure' => "directory",
'owner' => "root",
'group' => "root",
'purge' => true,
should create_file("sources.list.d").with({
'path' => "/etc/apt/sources.list.d",
'ensure' => "directory",
'owner' => "root",
'group' => "root",
'purge' => true,
- 'recurse' => true
+ 'recurse' => true,
+ 'notify' => 'Exec[apt_update]'
})
else
should create_file("sources.list.d").with({
})
else
should create_file("sources.list.d").with({
@@
-79,7
+80,8
@@
describe 'apt', :type => :class do
'owner' => "root",
'group' => "root",
'purge' => false,
'owner' => "root",
'group' => "root",
'purge' => false,
- 'recurse' => false
+ 'recurse' => false,
+ 'notify' => 'Exec[apt_update]'
})
end
}
})
end
}
@@
-87,7
+89,6
@@
describe 'apt', :type => :class do
it {
should contain_exec("apt_update").with({
'command' => "/usr/bin/apt-get update",
it {
should contain_exec("apt_update").with({
'command' => "/usr/bin/apt-get update",
- 'subscribe' => ["File[sources.list]", "File[sources.list.d]"],
'refreshonly' => refresh_only_apt_update
})
}
'refreshonly' => refresh_only_apt_update
})
}
@@
-115,18
+116,18
@@
describe 'apt', :type => :class do
if param_hash[:proxy_host]
should contain_file('configure-apt-proxy').with(
'path' => '/etc/apt/apt.conf.d/proxy',
if param_hash[:proxy_host]
should contain_file('configure-apt-proxy').with(
'path' => '/etc/apt/apt.conf.d/proxy',
- 'content' => "Acquire::http::Proxy \"http://#{param_hash[:proxy_host]}:#{param_hash[:proxy_port]}\";"
+ 'content' => "Acquire::http::Proxy \"http://#{param_hash[:proxy_host]}:#{param_hash[:proxy_port]}\";",
+ 'notify' => "Exec[apt_update]"
)
else
)
else
- should_not contain_file('configure_apt_proxy')
+ should contain_file('configure-apt-proxy').with(
+ 'path' => '/etc/apt/apt.conf.d/proxy',
+ 'notify' => 'Exec[apt_update]',
+ 'ensure' => 'absent'
+ )
end
}
end
end
end
end
}
end
end
end
-
- describe "it should not error if package['python-software-properties'] is already defined" do
- let(:pre_condition) { 'package { "python-software-properties": }->Class["Apt"]' }
- it { should contain_package("python-software-properties") }
- end
end
end