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 '1.5.x' of https://github.com/puppetlabs/puppetlabs-apt into 1.5.x
[puppet-modules/puppetlabs-apt.git]
/
spec
/
acceptance
/
apt_key_provider_spec.rb
diff --git
a/spec/acceptance/apt_key_provider_spec.rb
b/spec/acceptance/apt_key_provider_spec.rb
index 1d39a973b2e04dee32abe4fbcf7cd150fc01c270..0a314959577c953ed7b99a8a3519de4c2986ce57 100644
(file)
--- a/
spec/acceptance/apt_key_provider_spec.rb
+++ b/
spec/acceptance/apt_key_provider_spec.rb
@@
-7,7
+7,7
@@
CENTOS_GPG_KEY_ID = 'C105B9DE'
CENTOS_REPO_URL = 'ftp.cvut.cz/centos'
CENTOS_GPG_KEY_FILE = 'RPM-GPG-KEY-CentOS-6'
CENTOS_REPO_URL = 'ftp.cvut.cz/centos'
CENTOS_GPG_KEY_FILE = 'RPM-GPG-KEY-CentOS-6'
-describe 'apt_key' do
+describe 'apt_key'
, :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))
do
before(:each) do
shell("apt-key del #{PUPPETLABS_GPG_KEY_ID}",
:acceptable_exit_codes => [0,1,2])
before(:each) do
shell("apt-key del #{PUPPETLABS_GPG_KEY_ID}",
:acceptable_exit_codes => [0,1,2])
@@
-203,7
+203,7
@@
ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
EOS
apply_manifest(pp, :expect_failures => true) do |r|
EOS
apply_manifest(pp, :expect_failures => true) do |r|
- expect(r.stderr).to match(/
Host not found
/)
+ expect(r.stderr).to match(/
(Host not found|Couldn't resolve host)
/)
end
end
end
end
end
end