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 #706 from tphoney/rubocopification
[puppet-modules/puppetlabs-apt.git]
/
spec
/
acceptance
/
apt_spec.rb
diff --git
a/spec/acceptance/apt_spec.rb
b/spec/acceptance/apt_spec.rb
index df312a756041025184ffd2c8d21f5f0de5b7d601..e8950d1fbda992144e63ac653eb817148ad649f6 100644
(file)
--- a/
spec/acceptance/apt_spec.rb
+++ b/
spec/acceptance/apt_spec.rb
@@
-2,10
+2,9
@@
require 'spec_helper_acceptance'
MAX_TIMEOUT_RETRY = 3
TIMEOUT_RETRY_WAIT = 5
MAX_TIMEOUT_RETRY = 3
TIMEOUT_RETRY_WAIT = 5
-TIMEOUT_ERROR_MATCHER
= /no valid OpenPGP data found/
+TIMEOUT_ERROR_MATCHER
= %r{no valid OpenPGP data found}
describe 'apt class' do
describe 'apt class' do
-
context 'reset' do
it 'fixes the sources.list' do
shell('cp /etc/apt/sources.list /tmp')
context 'reset' do
it 'fixes the sources.list' do
shell('cp /etc/apt/sources.list /tmp')
@@
-13,7
+12,7
@@
describe 'apt class' do
end
context 'all the things' do
end
context 'all the things' do
- it '
should work
with no errors' do
+ it '
works
with no errors' do
pp = <<-EOS
if $::lsbdistcodename == 'lucid' {
$sources = undef
pp = <<-EOS
if $::lsbdistcodename == 'lucid' {
$sources = undef
@@
-46,14
+45,14
@@
describe 'apt class' do
}
EOS
}
EOS
- #Apply the manifest (Retry if timeout error is received from key pool)
+ #
Apply the manifest (Retry if timeout error is received from key pool)
retry_on_error_matching(MAX_TIMEOUT_RETRY, TIMEOUT_RETRY_WAIT, TIMEOUT_ERROR_MATCHER) do
retry_on_error_matching(MAX_TIMEOUT_RETRY, TIMEOUT_RETRY_WAIT, TIMEOUT_ERROR_MATCHER) do
- apply_manifest(pp,
:catch_failures =>
true)
+ apply_manifest(pp,
catch_failures:
true)
end
end
- apply_manifest(pp,
:catch_failures =>
true)
+ apply_manifest(pp,
catch_failures:
true)
end
end
- it 's
hould still
work' do
+ it 's
tills
work' do
shell('apt-get update')
shell('apt-get -y --force-yes upgrade')
end
shell('apt-get update')
shell('apt-get -y --force-yes upgrade')
end
@@
-64,5
+63,4
@@
describe 'apt class' do
shell('cp /tmp/sources.list /etc/apt')
end
end
shell('cp /tmp/sources.list /etc/apt')
end
end
-
end
end