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 #1075 from xepa/xepa-patch-1
[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 7fe1d033297ea9061b8ee5569361083785c83838..7e4fe3787b27d86521ac840e837fa6082f084dab 100644
(file)
--- a/
spec/acceptance/apt_spec.rb
+++ b/
spec/acceptance/apt_spec.rb
@@
-1,3
+1,5
@@
+# frozen_string_literal: true
+
require 'spec_helper_acceptance'
everything_everything_pp = <<-MANIFEST
require 'spec_helper_acceptance'
everything_everything_pp = <<-MANIFEST
@@
-8,7
+10,7
@@
everything_everything_pp = <<-MANIFEST
'repos' => 'main',
'key' => {
'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
'repos' => 'main',
'key' => {
'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
- 'server' => '
pool.sks-keyservers.net
',
+ 'server' => '
keyserver.ubuntu.com
',
},
},
}
},
},
}
@@
-23,6
+25,7
@@
everything_everything_pp = <<-MANIFEST
'sources.list.d' => true,
'preferences' => true,
'preferences.d' => true,
'sources.list.d' => true,
'preferences' => true,
'preferences.d' => true,
+ 'apt.conf.d' => true,
},
sources => $sources,
}
},
sources => $sources,
}
@@
-31,7
+34,7
@@
everything_everything_pp = <<-MANIFEST
describe 'apt class' do
context 'with reset' do
it 'fixes the sources.list' do
describe 'apt class' do
context 'with reset' do
it 'fixes the sources.list' do
- shell('cp /etc/apt/sources.list /tmp')
+
run_
shell('cp /etc/apt/sources.list /tmp')
end
end
end
end
@@
-43,14
+46,14
@@
describe 'apt class' do
end
end
it 'stills work' do
end
end
it 'stills work' do
- shell('apt-get update')
- shell('apt-get -y --force-yes upgrade')
+
run_
shell('apt-get update')
+
run_
shell('apt-get -y --force-yes upgrade')
end
end
context 'with reset' do
it 'fixes the sources.list' do
end
end
context 'with reset' do
it 'fixes the sources.list' do
- shell('cp /tmp/sources.list /etc/apt')
+
run_
shell('cp /tmp/sources.list /etc/apt')
end
end
end
end
end
end