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 #964 from kenyon/use-modern-os-facts
[puppet-modules/puppetlabs-apt.git]
/
spec
/
defines
/
source_spec.rb
diff --git
a/spec/defines/source_spec.rb
b/spec/defines/source_spec.rb
index dc8466cfd558a04b757b47a13ad46f937010af2e..94446bfa9febdbdf68417346f99dbea62720a642 100644
(file)
--- a/
spec/defines/source_spec.rb
+++ b/
spec/defines/source_spec.rb
@@
-1,7
+1,9
@@
+# frozen_string_literal: true
+
require 'spec_helper'
describe 'apt::source' do
require 'spec_helper'
describe 'apt::source' do
- GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'
.freeze
+ GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'
let :pre_condition do
'class { "apt": }'
let :pre_condition do
'class { "apt": }'
@@
-13,11
+15,18
@@
describe 'apt::source' do
let :facts do
{
let :facts do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
- lsbdistid: 'Debian',
- lsbdistcodename: 'jessie',
- operatingsystem: 'Debian',
- osfamily: 'Debian',
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '8',
+ full: '8.0',
+ },
+ distro: {
+ codename: 'jessie',
+ id: 'Debian',
+ },
+ },
}
end
}
end
@@
-161,10
+170,18
@@
describe 'apt::source' do
context 'with a https location and custom release, install apt-transport-https' do
let :facts do
{
context 'with a https location and custom release, install apt-transport-https' do
let :facts do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
- lsbdistid: 'Debian',
- lsbdistcodename: 'jessie',
- osfamily: 'Debian',
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '8',
+ full: '8.0',
+ },
+ distro: {
+ codename: 'jessie',
+ id: 'Debian',
+ },
+ },
puppetversion: Puppet.version,
}
end
puppetversion: Puppet.version,
}
end
@@
-184,10
+201,18
@@
describe 'apt::source' do
context 'with a https location, do not install apt-transport-https on oses not in list eg buster' do
let :facts do
{
context 'with a https location, do not install apt-transport-https on oses not in list eg buster' do
let :facts do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '10', full: '10.0' } },
- lsbdistid: 'Debian',
- lsbdistcodename: 'buster',
- osfamily: 'Debian',
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '10',
+ full: '10.0',
+ },
+ distro: {
+ codename: 'buster',
+ id: 'Debian',
+ },
+ },
}
end
let :params do
}
end
let :params do
@@
-205,10
+230,18
@@
describe 'apt::source' do
context 'with architecture equals x86_64' do
let :facts do
{
context 'with architecture equals x86_64' do
let :facts do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
- lsbdistid: 'Debian',
- lsbdistcodename: 'wheezy',
- osfamily: 'Debian',
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '7',
+ full: '7.0',
+ },
+ distro: {
+ codename: 'wheezy',
+ id: 'Debian',
+ },
+ },
}
end
let :params do
}
end
let :params do
@@
-297,14
+330,23
@@
describe 'apt::source' do
context 'with no release' do
let :facts do
{
context 'with no release' do
let :facts do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
- osfamily: 'Debian',
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '8',
+ full: '8.0',
+ },
+ distro: {
+ id: 'Debian',
+ },
+ },
}
end
let(:params) { { location: 'hello.there' } }
it do
}
end
let(:params) { { location: 'hello.there' } }
it do
- is_expected.to raise_error(Puppet::Error, %r{
lsbdist
codename fact not available: release parameter required})
+ is_expected.to raise_error(Puppet::Error, %r{
os.distro.
codename fact not available: release parameter required})
end
end
end
end