From 3423414fec223617fafb0806c8147a96ebedc80e Mon Sep 17 00:00:00 2001 From: David Swan Date: Fri, 25 May 2018 14:16:30 +0100 Subject: [PATCH] [FM-6956] Removal of unsupported OS from apt --- metadata.json | 1 - spec/classes/apt_backports_spec.rb | 36 +++++++-------- spec/classes/apt_spec.rb | 30 ++++++------- spec/classes/apt_update_spec.rb | 28 ++++++------ spec/defines/conf_spec.rb | 4 +- spec/defines/key_compat_spec.rb | 2 +- spec/defines/key_spec.rb | 4 +- spec/defines/pin_spec.rb | 4 +- spec/defines/ppa_spec.rb | 28 ++++++------ spec/defines/setting_spec.rb | 10 ++--- spec/defines/source_compat_spec.rb | 28 ++++++------ spec/defines/source_spec.rb | 70 +++++++++++++++--------------- 12 files changed, 122 insertions(+), 123 deletions(-) diff --git a/metadata.json b/metadata.json index 080cda3..15f6b79 100644 --- a/metadata.json +++ b/metadata.json @@ -17,7 +17,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "7", "8" ] }, diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb index 33022b9..215faae 100644 --- a/spec/classes/apt_backports_spec.rb +++ b/spec/classes/apt_backports_spec.rb @@ -7,10 +7,10 @@ describe 'apt::backports', type: :class do context 'with defaults on deb' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -19,18 +19,18 @@ describe 'apt::backports', type: :class do is_expected.to contain_apt__source('backports').with(location: 'http://deb.debian.org/debian', key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', repos: 'main contrib non-free', - release: 'wheezy-backports', - pin: { 'priority' => 200, 'release' => 'wheezy-backports' }) + release: 'jessie-backports', + pin: { 'priority' => 200, 'release' => 'jessie-backports' }) } end context 'with defaults on ubuntu' do let(:facts) do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, lsbdistid: 'Ubuntu', osfamily: 'Debian', - lsbdistcodename: 'trusty', - lsbdistrelease: '14.04', + lsbdistcodename: 'xenial', + lsbdistrelease: '16.04', puppetversion: Puppet.version, } end @@ -39,18 +39,18 @@ describe 'apt::backports', type: :class do is_expected.to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu', key: '630239CC130E1A7FD81A27B140976EAF437D05B5', repos: 'main universe multiverse restricted', - release: 'trusty-backports', - pin: { 'priority' => 200, 'release' => 'trusty-backports' }) + release: 'xenial-backports', + pin: { 'priority' => 200, 'release' => 'xenial-backports' }) } end context 'with everything set' do let(:facts) do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, lsbdistid: 'Ubuntu', osfamily: 'Debian', - lsbdistcodename: 'trusty', - lsbdistrelease: '14.04', + lsbdistcodename: 'xenial', + lsbdistrelease: '16.04', puppetversion: Puppet.version, } end @@ -75,11 +75,11 @@ describe 'apt::backports', type: :class do context 'when set things with hashes' do let(:facts) do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, lsbdistid: 'Ubuntu', osfamily: 'Debian', - lsbdistcodename: 'trusty', - lsbdistrelease: '14.04', + lsbdistcodename: 'xenial', + lsbdistrelease: '16.04', puppetversion: Puppet.version, } end @@ -185,11 +185,11 @@ describe 'apt::backports', type: :class do describe 'validation' do let(:facts) do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, lsbdistid: 'Ubuntu', osfamily: 'Debian', - lsbdistcodename: 'trusty', - lsbdistrelease: '14.04', + lsbdistcodename: 'xenial', + lsbdistrelease: '16.04', puppetversion: Puppet.version, } end diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb index 0c6333b..7fdfb77 100644 --- a/spec/classes/apt_spec.rb +++ b/spec/classes/apt_spec.rb @@ -188,11 +188,11 @@ describe 'apt' do context 'with sources defined on valid osfamily' do let :facts do - { os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04' } }, + { os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'Ubuntu', - lsbdistrelease: '12.04', + lsbdistrelease: '16.04', puppetversion: Puppet.version } end let(:params) do @@ -224,15 +224,15 @@ describe 'apt' do is_expected.to contain_apt__setting('list-puppetlabs').with(ensure: 'present') } - it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com precise main$}) } + it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com xenial main$}) } end context 'with confs defined on valid osfamily' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'Debian', puppetversion: Puppet.version, } @@ -260,9 +260,9 @@ describe 'apt' do context 'with keys defined on valid osfamily' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'Debian', puppetversion: Puppet.version, } @@ -290,11 +290,11 @@ describe 'apt' do context 'with ppas defined on valid osfamily' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'ubuntu', - lsbdistrelease: '12.04', + lsbdistrelease: '16.04', puppetversion: Puppet.version, } end @@ -312,9 +312,9 @@ describe 'apt' do context 'with settings defined on valid osfamily' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'Debian', puppetversion: Puppet.version, } @@ -333,9 +333,9 @@ describe 'apt' do context 'with pins defined on valid osfamily' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'Debian', puppetversion: Puppet.version, } diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb index 9553e72..3fb587e 100644 --- a/spec/classes/apt_update_spec.rb +++ b/spec/classes/apt_update_spec.rb @@ -10,11 +10,11 @@ describe 'apt::update', type: :class do context "when $::apt_update_last_success indicates #{desc}" do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', apt_update_last_success: factval, - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -31,10 +31,10 @@ describe 'apt::update', type: :class do context 'when $::apt_update_last_success is nil' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -55,11 +55,11 @@ describe 'apt::update', type: :class do context "when $::apt_update_last_success indicates #{desc}" do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', apt_update_last_success: factval, - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -74,10 +74,10 @@ describe 'apt::update', type: :class do context 'when $::apt_update_last_success is nil' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -95,11 +95,11 @@ describe 'apt::update', type: :class do context "when $::apt_update_last_success indicates #{desc}" do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', apt_update_last_success: factval, - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -114,10 +114,10 @@ describe 'apt::update', type: :class do context 'when the $::apt_update_last_success fact has a recent value' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', apt_update_last_success: Time.now.to_i, puppetversion: Puppet.version, } @@ -132,10 +132,10 @@ describe 'apt::update', type: :class do context 'when $::apt_update_last_success is nil' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', apt_update_last_success: nil, puppetversion: Puppet.version, } diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb index d79cb22..7f75fd9 100644 --- a/spec/defines/conf_spec.rb +++ b/spec/defines/conf_spec.rb @@ -5,10 +5,10 @@ describe 'apt::conf', type: :define do end let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb index 43ccbbc..aee5855 100644 --- a/spec/defines/key_compat_spec.rb +++ b/spec/defines/key_compat_spec.rb @@ -23,7 +23,7 @@ describe 'apt::key', type: :define do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', puppetversion: Puppet.version, diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb index 2378d77..d196063 100644 --- a/spec/defines/key_spec.rb +++ b/spec/defines/key_spec.rb @@ -43,10 +43,10 @@ describe 'apt::key' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end diff --git a/spec/defines/pin_spec.rb b/spec/defines/pin_spec.rb index 2329e9a..1d0c6b1 100644 --- a/spec/defines/pin_spec.rb +++ b/spec/defines/pin_spec.rb @@ -5,10 +5,10 @@ describe 'apt::pin', type: :define do end let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb index b534186..365d520 100644 --- a/spec/defines/ppa_spec.rb +++ b/spec/defines/ppa_spec.rb @@ -7,9 +7,9 @@ describe 'apt::ppa' do describe 'defaults' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '11', full: '11.04' } }, - lsbdistrelease: '11.04', - lsbdistcodename: 'natty', + os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '41.04' } }, + lsbdistrelease: '14.04', + lsbdistcodename: 'trusty', operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', @@ -23,7 +23,7 @@ describe 'apt::ppa' do it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow+type').that_notifies('Class[Apt::Update]').with(environment: [], command: '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow+type', # rubocop:disable Metrics/LineLength - unless: '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow_type-natty.list', # rubocop:disable Metrics/LineLength + unless: '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow_type-trusty.list', # rubocop:disable Metrics/LineLength user: 'root', logoutput: 'on_failure') } @@ -65,9 +65,9 @@ describe 'apt::ppa' do end let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '11', full: '11.04' } }, - lsbdistrelease: '11.04', - lsbdistcodename: 'natty', + os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + lsbdistrelease: '14.04', + lsbdistcodename: 'trusty', operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', @@ -81,13 +81,13 @@ describe 'apt::ppa' do it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with('environment' => [], 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow', # rubocop:disable Metrics/LineLength - 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list', # rubocop:disable Metrics/LineLength + 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list', # rubocop:disable Metrics/LineLength 'user' => 'root', 'logoutput' => 'on_failure') } it { - is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-natty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file') + is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file') } end @@ -137,9 +137,9 @@ describe 'apt::ppa' do end let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '11', full: '11.04' } }, - lsbdistrelease: '11.04', - lsbdistcodename: 'natty', + os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + lsbdistrelease: '14.04', + lsbdistcodename: 'trusty', operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', @@ -158,13 +158,13 @@ describe 'apt::ppa' do it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with('environment' => [], 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow', # rubocop:disable Metrics/LineLength - 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list', # rubocop:disable Metrics/LineLength + 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list', # rubocop:disable Metrics/LineLength 'user' => 'root', 'logoutput' => 'on_failure') } it { - is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-natty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file') + is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file') } end diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb index 1a94de7..2d70414 100644 --- a/spec/defines/setting_spec.rb +++ b/spec/defines/setting_spec.rb @@ -4,9 +4,9 @@ describe 'apt::setting' do let(:pre_condition) { 'class { "apt": }' } let :facts do { - os: { distro: { codename: 'wheezy' }, family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, - lsbdistrelease: '7.0', - lsbdistcodename: 'wheezy', + os: { distro: { codename: 'wheezy' }, family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, + lsbdistrelease: '8.0', + lsbdistcodename: 'jessie', operatingsystem: 'Debian', osfamily: 'Debian', lsbdistid: 'Debian', @@ -77,10 +77,10 @@ describe 'apt::setting' do end let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end diff --git a/spec/defines/source_compat_spec.rb b/spec/defines/source_compat_spec.rb index f89f4be..907fde1 100644 --- a/spec/defines/source_compat_spec.rb +++ b/spec/defines/source_compat_spec.rb @@ -10,9 +10,9 @@ describe 'apt::source', type: :define do context 'with mostly defaults' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -26,16 +26,16 @@ describe 'apt::source', type: :define do end it { - is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb-src http://debian.mirror.iweb.ca/debian/ wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb-src http://debian.mirror.iweb.ca/debian/ jessie main\n}) } end context 'with no defaults' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -74,9 +74,9 @@ describe 'apt::source', type: :define do context 'when allow_unsigned true' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -89,15 +89,15 @@ describe 'apt::source', type: :define do } end - it { is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[trusted=yes\] http://debian.mirror.iweb.ca/debian/ wheezy main\n}) } + it { is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[trusted=yes\] http://debian.mirror.iweb.ca/debian/ jessie main\n}) } end context 'with architecture equals x86_64' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -110,16 +110,16 @@ describe 'apt::source', type: :define do end it { - is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[arch=x86_64\] http://debian.mirror.iweb.ca/debian/ wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[arch=x86_64\] http://debian.mirror.iweb.ca/debian/ jessie main\n}) } end context 'with ensure => absent' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -139,7 +139,7 @@ describe 'apt::source', type: :define do context 'with no release' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', puppetversion: Puppet.version, diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb index a9077e9..ee88132 100644 --- a/spec/defines/source_spec.rb +++ b/spec/defines/source_spec.rb @@ -15,9 +15,9 @@ describe 'apt::source' do context 'without location' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -29,9 +29,9 @@ describe 'apt::source' do context 'with location' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -47,12 +47,12 @@ describe 'apt::source' do describe 'no defaults' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', operatingsystem: 'Debian', - lsbdistrelease: '7.0', + lsbdistrelease: '8.0', puppetversion: Puppet.version, } end @@ -68,7 +68,7 @@ describe 'apt::source' do end it { - is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{hello.there wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{hello.there jessie main\n}) } it { is_expected.to contain_file('/etc/apt/sources.list.d/my_source.list').that_notifies('Class[Apt::Update]') } @@ -183,9 +183,9 @@ describe 'apt::source' do context 'with allow_unsigned true' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -198,7 +198,7 @@ describe 'apt::source' do end it { - is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb \[trusted=yes\] hello.there wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb \[trusted=yes\] hello.there jessie main\n}) } end @@ -229,9 +229,9 @@ describe 'apt::source' do let :facts do { architecture: 'amd64', - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -244,16 +244,16 @@ describe 'apt::source' do end it { - is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb-src hello.there wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb-src hello.there jessie main\n}) } end context 'with include_src => true' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -266,16 +266,16 @@ describe 'apt::source' do end it { - is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb hello.there wheezy main\ndeb-src hello.there wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb hello.there jessie main\ndeb-src hello.there jessie main\n}) } end context 'with include deb => false' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'debian', puppetversion: Puppet.version, } @@ -296,9 +296,9 @@ describe 'apt::source' do context 'with include src => true and include deb => false' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'debian', puppetversion: Puppet.version, } @@ -311,17 +311,17 @@ describe 'apt::source' do end it { - is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{deb-src hello.there wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{deb-src hello.there jessie main\n}) } - it { is_expected.to contain_apt__setting('list-my_source').without_content(%r{deb hello.there wheezy main\n}) } + it { is_expected.to contain_apt__setting('list-my_source').without_content(%r{deb hello.there jessie main\n}) } end context 'with ensure => absent' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -341,7 +341,7 @@ describe 'apt::source' do context 'with no release' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', puppetversion: Puppet.version, @@ -357,7 +357,7 @@ describe 'apt::source' do context 'with release is empty string' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', puppetversion: Puppet.version, @@ -371,9 +371,9 @@ describe 'apt::source' do context 'with invalid pin' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -393,9 +393,9 @@ describe 'apt::source' do context 'with notify_update = undef (default)' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -412,9 +412,9 @@ describe 'apt::source' do context 'with notify_update = true' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -432,9 +432,9 @@ describe 'apt::source' do context 'with notify_update = false' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } -- 2.32.3