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 #346 from mhaskel/1.6_test_fixes
[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 d9c2c0d7518c8534b8c89e12933926277124e2cf..0f20174d062cde85336e4c5229f0708f56e5d672 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'
, :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))
do
+describe 'apt_key' 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])
@@
-36,7
+36,7
@@
describe 'apt_key', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))
EOS
apply_manifest(pp, :catch_failures => true)
EOS
apply_manifest(pp, :catch_failures => true)
- expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+ apply_manifest(pp, :catch_failures => true)
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
end
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
end
@@
-74,7
+74,7
@@
describe 'apt_key', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))
# Time to remove it using Puppet
apply_manifest(pp, :catch_failures => true)
# Time to remove it using Puppet
apply_manifest(pp, :catch_failures => true)
- expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+ apply_manifest(pp, :catch_failures => true)
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}",
:acceptable_exit_codes => [1])
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}",
:acceptable_exit_codes => [1])
@@
-153,7
+153,7
@@
ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
EOS
apply_manifest(pp, :catch_failures => true)
EOS
apply_manifest(pp, :catch_failures => true)
- expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+ apply_manifest(pp, :catch_failures => true)
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
end
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
end
@@
-187,7
+187,7
@@
ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
EOS
apply_manifest(pp, :catch_failures => true)
EOS
apply_manifest(pp, :catch_failures => true)
- expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+ apply_manifest(pp, :catch_failures => true)
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
end
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
end
@@
-203,7
+203,7
@@
ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
EOS
apply_manifest(pp, :catch_failures => true)
EOS
apply_manifest(pp, :catch_failures => true)
- expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+ apply_manifest(pp, :catch_failures => true)
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
end
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
end
@@
-253,7
+253,7
@@
ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
EOS
apply_manifest(pp, :catch_failures => true)
EOS
apply_manifest(pp, :catch_failures => true)
- expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+ apply_manifest(pp, :catch_failures => true)
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
@@
-302,7
+302,7
@@
ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
EOS
apply_manifest(pp, :catch_failures => true)
EOS
apply_manifest(pp, :catch_failures => true)
- expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+ apply_manifest(pp, :catch_failures => true)
shell("apt-key list | grep #{CENTOS_GPG_KEY_ID}")
end
shell("apt-key list | grep #{CENTOS_GPG_KEY_ID}")
end
@@
-346,7
+346,7
@@
ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
EOS
apply_manifest(pp, :catch_failures => true)
EOS
apply_manifest(pp, :catch_failures => true)
- expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+ apply_manifest(pp, :catch_failures => true)
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
@@
-399,7
+399,7
@@
ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
EOS
apply_manifest(pp, :catch_failures => true)
EOS
apply_manifest(pp, :catch_failures => true)
- expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+ apply_manifest(pp, :catch_failures => true)
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
end
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
end
@@
-456,7
+456,7
@@
ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
EOS
apply_manifest(pp, :catch_failures => true)
EOS
apply_manifest(pp, :catch_failures => true)
- expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+ apply_manifest(pp, :catch_failures => true)
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
shell("apt-key list | grep #{PUPPETLABS_GPG_KEY_ID}")
end
@@
-469,6
+469,7
@@
ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
}
EOS
}
EOS
+ shell("apt-key del #{PUPPETLABS_GPG_KEY_ID}", :acceptable_exit_codes => [0,1,2])
apply_manifest(pp, :expect_failures => true) do |r|
expect(r.stderr).to match(/--keyserver-options this is totally/)
end
apply_manifest(pp, :expect_failures => true) do |r|
expect(r.stderr).to match(/--keyserver-options this is totally/)
end