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
manifests: use modern os facts
[puppet-modules/puppetlabs-apt.git]
/
spec
/
classes
/
apt_backports_spec.rb
diff --git
a/spec/classes/apt_backports_spec.rb
b/spec/classes/apt_backports_spec.rb
index 765269dd97d88a7b37cd2e7b810bcd8e8a32af68..795344001f1ff2c6527f32a400ec818fd6bf70c0 100644
(file)
--- a/
spec/classes/apt_backports_spec.rb
+++ b/
spec/classes/apt_backports_spec.rb
@@
-1,3
+1,5
@@
+# frozen_string_literal: true
+
require 'spec_helper'
describe 'apt::backports', type: :class do
require 'spec_helper'
describe 'apt::backports', type: :class do
@@
-7,10
+9,18
@@
describe 'apt::backports', type: :class do
context 'with defaults on deb' do
let(:facts) do
{
context 'with defaults on deb' do
let(:facts) do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
- lsbdistid: 'Debian',
- osfamily: 'Debian',
- lsbdistcodename: 'jessie',
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '8',
+ full: '8.0',
+ },
+ distro: {
+ codename: 'jessie',
+ id: 'Debian',
+ },
+ },
}
end
}
end
@@
-24,11
+34,18
@@
describe 'apt::backports', type: :class do
context 'with defaults on ubuntu' do
let(:facts) do
{
context 'with defaults on ubuntu' do
let(:facts) do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
- lsbdistid: 'Ubuntu',
- osfamily: 'Debian',
- lsbdistcodename: 'xenial',
- lsbdistrelease: '16.04',
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '16',
+ full: '16.04',
+ },
+ distro: {
+ codename: 'xenial',
+ id: 'Ubuntu',
+ },
+ },
}
end
}
end
@@
-43,11
+60,18
@@
describe 'apt::backports', type: :class do
context 'with everything set' do
let(:facts) do
{
context 'with everything set' do
let(:facts) do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
- lsbdistid: 'Ubuntu',
- osfamily: 'Debian',
- lsbdistcodename: 'xenial',
- lsbdistrelease: '16.04',
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '16',
+ full: '16.04',
+ },
+ distro: {
+ codename: 'xenial',
+ id: 'Ubuntu',
+ },
+ },
}
end
let(:params) do
}
end
let(:params) do
@@
-71,11
+95,18
@@
describe 'apt::backports', type: :class do
context 'when set things with hashes' do
let(:facts) do
{
context 'when set things with hashes' do
let(:facts) do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
- lsbdistid: 'Ubuntu',
- osfamily: 'Debian',
- lsbdistcodename: 'xenial',
- lsbdistrelease: '16.04',
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '16',
+ full: '16.04',
+ },
+ distro: {
+ codename: 'xenial',
+ id: 'Ubuntu',
+ },
+ },
}
end
let(:params) do
}
end
let(:params) do
@@
-98,10
+129,18
@@
describe 'apt::backports', type: :class do
describe 'mint tests' do
let(:facts) do
{
describe 'mint tests' do
let(:facts) do
{
- os: { family: 'Debian', name: 'Linuxmint', release: { major: '17', full: '17' } },
- lsbdistid: 'linuxmint',
- osfamily: 'Debian',
- lsbdistcodename: 'qiana',
+ os: {
+ family: 'Debian',
+ name: 'Linuxmint',
+ release: {
+ major: '17',
+ full: '17',
+ },
+ distro: {
+ codename: 'qiana',
+ id: 'linuxmint',
+ },
+ },
}
end
}
end
@@
-179,11
+218,18
@@
describe 'apt::backports', type: :class do
describe 'validation' do
let(:facts) do
{
describe 'validation' do
let(:facts) do
{
- os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
- lsbdistid: 'Ubuntu',
- osfamily: 'Debian',
- lsbdistcodename: 'xenial',
- lsbdistrelease: '16.04',
+ os: {
+ family: 'Debian',
+ name: 'Ubuntu',
+ release: {
+ major: '16',
+ full: '16.04',
+ },
+ distro: {
+ codename: 'xenial',
+ id: 'Ubuntu',
+ },
+ },
}
end
}
end