From 11a73f9c760ec405daa739d268033b0d06b1ecd0 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 7 Dec 2018 14:10:40 +0100 Subject: [PATCH] (maint) Remove duplicated fact declarations (#828) * (maint) Remove duplicated fact declarations * (maint) Correct lsbdist facts in tests * (maint) Remove the puppetversion fact in testing * (maint) - Remove blank line --- spec/classes/apt_backports_spec.rb | 6 -- spec/classes/apt_spec.rb | 23 ++--- spec/classes/apt_update_spec.rb | 7 -- spec/defines/conf_spec.rb | 1 - spec/defines/key_compat_spec.rb | 1 - spec/defines/key_spec.rb | 1 - spec/defines/pin_spec.rb | 1 - spec/defines/ppa_spec.rb | 11 --- spec/defines/setting_spec.rb | 10 +- spec/defines/source_compat_spec.rb | 57 ++--------- spec/defines/source_spec.rb | 151 +++-------------------------- 11 files changed, 31 insertions(+), 238 deletions(-) diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb index 215faae..776026a 100644 --- a/spec/classes/apt_backports_spec.rb +++ b/spec/classes/apt_backports_spec.rb @@ -11,7 +11,6 @@ describe 'apt::backports', type: :class do lsbdistid: 'Debian', osfamily: 'Debian', lsbdistcodename: 'jessie', - puppetversion: Puppet.version, } end @@ -31,7 +30,6 @@ describe 'apt::backports', type: :class do osfamily: 'Debian', lsbdistcodename: 'xenial', lsbdistrelease: '16.04', - puppetversion: Puppet.version, } end @@ -51,7 +49,6 @@ describe 'apt::backports', type: :class do osfamily: 'Debian', lsbdistcodename: 'xenial', lsbdistrelease: '16.04', - puppetversion: Puppet.version, } end let(:params) do @@ -80,7 +77,6 @@ describe 'apt::backports', type: :class do osfamily: 'Debian', lsbdistcodename: 'xenial', lsbdistrelease: '16.04', - puppetversion: Puppet.version, } end let(:params) do @@ -107,7 +103,6 @@ describe 'apt::backports', type: :class do lsbdistid: 'linuxmint', osfamily: 'Debian', lsbdistcodename: 'qiana', - puppetversion: Puppet.version, } end @@ -190,7 +185,6 @@ describe 'apt::backports', type: :class do osfamily: 'Debian', lsbdistcodename: 'xenial', lsbdistrelease: '16.04', - puppetversion: Puppet.version, } end diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb index 69cbb8c..15ac28c 100644 --- a/spec/classes/apt_spec.rb +++ b/spec/classes/apt_spec.rb @@ -38,8 +38,7 @@ describe 'apt' do os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', - puppetversion: Puppet.version, + lsbdistcodename: 'jessie', } end @@ -252,12 +251,13 @@ machine apt.example.com login aptlogin password supersecret context 'with sources defined on valid osfamily' do let :facts do - { os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, + { + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', lsbdistcodename: 'xenial', lsbdistid: 'Ubuntu', lsbdistrelease: '16.04', - puppetversion: Puppet.version } + } end let(:params) do { sources: { @@ -297,8 +297,7 @@ machine apt.example.com login aptlogin password supersecret os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', lsbdistcodename: 'xenial', - lsbdistid: 'Debian', - puppetversion: Puppet.version, + lsbdistid: 'Ubuntu', } end let(:params) do @@ -327,8 +326,7 @@ machine apt.example.com login aptlogin password supersecret os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', lsbdistcodename: 'xenial', - lsbdistid: 'Debian', - puppetversion: Puppet.version, + lsbdistid: 'Ubuntu', } end let(:params) do @@ -357,9 +355,8 @@ machine apt.example.com login aptlogin password supersecret os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', lsbdistcodename: 'xenial', - lsbdistid: 'ubuntu', + lsbdistid: 'Ubuntu', lsbdistrelease: '16.04', - puppetversion: Puppet.version, } end let(:params) do @@ -379,8 +376,7 @@ machine apt.example.com login aptlogin password supersecret os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', lsbdistcodename: 'xenial', - lsbdistid: 'Debian', - puppetversion: Puppet.version, + lsbdistid: 'Ubuntu', } end let(:params) do @@ -400,8 +396,7 @@ machine apt.example.com login aptlogin password supersecret os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', lsbdistcodename: 'xenial', - lsbdistid: 'Debian', - puppetversion: Puppet.version, + lsbdistid: 'Ubuntu', } end let(:params) do diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb index 3fb587e..d2683a2 100644 --- a/spec/classes/apt_update_spec.rb +++ b/spec/classes/apt_update_spec.rb @@ -15,7 +15,6 @@ describe 'apt::update', type: :class do osfamily: 'Debian', apt_update_last_success: factval, lsbdistcodename: 'jessie', - puppetversion: Puppet.version, } end let(:pre_condition) do @@ -35,7 +34,6 @@ describe 'apt::update', type: :class do lsbdistid: 'Debian', osfamily: 'Debian', lsbdistcodename: 'jessie', - puppetversion: Puppet.version, } end let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'always' },}" } @@ -60,7 +58,6 @@ describe 'apt::update', type: :class do osfamily: 'Debian', apt_update_last_success: factval, lsbdistcodename: 'jessie', - puppetversion: Puppet.version, } end let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" } @@ -78,7 +75,6 @@ describe 'apt::update', type: :class do lsbdistid: 'Debian', osfamily: 'Debian', lsbdistcodename: 'jessie', - puppetversion: Puppet.version, } end let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" } @@ -100,7 +96,6 @@ describe 'apt::update', type: :class do osfamily: 'Debian', apt_update_last_success: factval, lsbdistcodename: 'jessie', - puppetversion: Puppet.version, } end let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" } @@ -119,7 +114,6 @@ describe 'apt::update', type: :class do osfamily: 'Debian', lsbdistcodename: 'jessie', apt_update_last_success: Time.now.to_i, - puppetversion: Puppet.version, } end let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" } @@ -137,7 +131,6 @@ describe 'apt::update', type: :class do osfamily: 'Debian', lsbdistcodename: 'jessie', apt_update_last_success: nil, - puppetversion: Puppet.version, } end let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" } diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb index 7f75fd9..1c0ee16 100644 --- a/spec/defines/conf_spec.rb +++ b/spec/defines/conf_spec.rb @@ -9,7 +9,6 @@ describe 'apt::conf', type: :define do lsbdistid: 'Debian', osfamily: 'Debian', lsbdistcodename: 'jessie', - puppetversion: Puppet.version, } end let :title do diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb index 7a6804c..47b03d4 100644 --- a/spec/defines/key_compat_spec.rb +++ b/spec/defines/key_compat_spec.rb @@ -26,7 +26,6 @@ describe 'apt::key', type: :define do os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - puppetversion: Puppet.version, } end diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb index 04062f0..68d5fce 100644 --- a/spec/defines/key_spec.rb +++ b/spec/defines/key_spec.rb @@ -48,7 +48,6 @@ describe 'apt::key' do lsbdistid: 'Debian', osfamily: 'Debian', lsbdistcodename: 'jessie', - puppetversion: Puppet.version, } end diff --git a/spec/defines/pin_spec.rb b/spec/defines/pin_spec.rb index 1d0c6b1..a80ee6f 100644 --- a/spec/defines/pin_spec.rb +++ b/spec/defines/pin_spec.rb @@ -9,7 +9,6 @@ describe 'apt::pin', type: :define do lsbdistid: 'Debian', osfamily: 'Debian', lsbdistcodename: 'jessie', - puppetversion: Puppet.version, } end let(:title) { 'my_pin' } diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb index fa893b6..ba234fd 100644 --- a/spec/defines/ppa_spec.rb +++ b/spec/defines/ppa_spec.rb @@ -13,7 +13,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', - puppetversion: Puppet.version, } end @@ -38,7 +37,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', - puppetversion: Puppet.version, } end @@ -71,7 +69,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', - puppetversion: Puppet.version, } end @@ -103,7 +100,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', - puppetversion: Puppet.version, } end let :params do @@ -142,7 +138,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', lsbdistid: 'Ubuntu', osfamily: 'Debian', - puppetversion: Puppet.version, } end let :params do @@ -179,7 +174,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', lsbdistid: 'Ubuntu', osfamily: 'Debian', - puppetversion: Puppet.version, } end let :params do @@ -214,7 +208,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', lsbdistid: 'Ubuntu', osfamily: 'Debian', - puppetversion: Puppet.version, } end let :params do @@ -249,7 +242,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', lsbdistid: 'Ubuntu', osfamily: 'Debian', - puppetversion: Puppet.version, } end let :params do @@ -282,7 +274,6 @@ describe 'apt::ppa' do operatingsystem: 'Ubuntu', lsbdistid: 'Ubuntu', osfamily: 'Debian', - puppetversion: Puppet.version, } end let(:title) { 'ppa:user/foo' } @@ -307,7 +298,6 @@ describe 'apt::ppa' do lsbdistid: 'Ubuntu', osfamily: 'Debian', lsbdistcodeanme: nil, - puppetversion: Puppet.version, } end let(:title) { 'ppa:user/foo' } @@ -326,7 +316,6 @@ describe 'apt::ppa' do operatingsystem: 'Debian', lsbdistid: 'debian', osfamily: 'Debian', - puppetversion: Puppet.version, } end let(:title) { 'ppa:user/foo' } diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb index 2d70414..7e2a908 100644 --- a/spec/defines/setting_spec.rb +++ b/spec/defines/setting_spec.rb @@ -4,13 +4,12 @@ describe 'apt::setting' do let(:pre_condition) { 'class { "apt": }' } let :facts do { - os: { distro: { codename: 'wheezy' }, family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, + os: { distro: { codename: 'jessie' }, family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistrelease: '8.0', lsbdistcodename: 'jessie', operatingsystem: 'Debian', osfamily: 'Debian', lsbdistid: 'Debian', - puppetversion: Puppet.version, } end let(:title) { 'conf-teddybear' } @@ -81,7 +80,6 @@ describe 'apt::setting' do lsbdistid: 'Debian', osfamily: 'Debian', lsbdistcodename: 'jessie', - puppetversion: Puppet.version, } end let(:title) { 'conf-teddybear' } @@ -121,11 +119,7 @@ describe 'apt::setting' do context 'with priority=1.2' do let(:params) { default_params.merge(priority: 1.2) } - if Puppet::Util::Package.versioncmp(Puppet.version, '4.0') >= 0 || ENV['FUTURE_PARSER'] == 'yes' - it { is_expected.to compile.and_raise_error(%r{expects a value of type}) } - else - it { is_expected.to compile.and_raise_error(%r{priority must be an integer or a zero-padded integer}) } - end + it { is_expected.to compile.and_raise_error(%r{expects a value of type}) } end end diff --git a/spec/defines/source_compat_spec.rb b/spec/defines/source_compat_spec.rb index 907fde1..12d3d47 100644 --- a/spec/defines/source_compat_spec.rb +++ b/spec/defines/source_compat_spec.rb @@ -7,17 +7,16 @@ describe 'apt::source', type: :define do 'my_source' end - context 'with mostly defaults' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end + let :facts do + { + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, + lsbdistid: 'Debian', + lsbdistcodename: 'jessie', + osfamily: 'Debian', + } + end + context 'with mostly defaults' do let :params do { 'include' => { 'deb' => false, 'src' => true }, @@ -31,15 +30,6 @@ describe 'apt::source', type: :define do end context 'with no defaults' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let :params do { 'comment' => 'foo', @@ -72,15 +62,6 @@ describe 'apt::source', type: :define do end context 'when allow_unsigned true' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let :params do { 'include' => { 'src' => false }, @@ -93,15 +74,6 @@ describe 'apt::source', type: :define do end context 'with architecture equals x86_64' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let :params do { 'location' => 'http://debian.mirror.iweb.ca/debian/', @@ -115,15 +87,6 @@ describe 'apt::source', type: :define do end context 'with ensure => absent' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let :params do { 'ensure' => 'absent', @@ -140,9 +103,7 @@ describe 'apt::source', type: :define do let :facts do { os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', osfamily: 'Debian', - puppetversion: Puppet.version, } end diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb index 69338ff..dc8466c 100644 --- a/spec/defines/source_spec.rb +++ b/spec/defines/source_spec.rb @@ -11,31 +11,23 @@ describe 'apt::source' do 'my_source' end + let :facts do + { + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, + lsbdistid: 'Debian', + lsbdistcodename: 'jessie', + operatingsystem: 'Debian', + osfamily: 'Debian', + } + end + context 'with defaults' do context 'without location' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - osfamily: 'Debian', - lsbdistcodename: 'jessie', - puppetversion: Puppet.version, - } - end - it do is_expected.to raise_error(Puppet::Error, %r{source entry without specifying a location}) end end context 'with location' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let(:params) { { location: 'hello.there' } } it { @@ -46,18 +38,6 @@ describe 'apt::source' do end describe 'no defaults' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - operatingsystem: 'Debian', - lsbdistrelease: '8.0', - puppetversion: Puppet.version, - } - end - context 'with complex pin' do let :params do { @@ -153,15 +133,6 @@ describe 'apt::source' do end context 'with allow_unsigned true' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let :params do { location: 'hello.there', @@ -175,15 +146,6 @@ describe 'apt::source' do end context 'with a https location, 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', - puppetversion: Puppet.version, - } - end let :params do { location: 'HTTPS://foo.bar', @@ -226,7 +188,6 @@ describe 'apt::source' do lsbdistid: 'Debian', lsbdistcodename: 'buster', osfamily: 'Debian', - puppetversion: Puppet.version, } end let :params do @@ -248,7 +209,6 @@ describe 'apt::source' do lsbdistid: 'Debian', lsbdistcodename: 'wheezy', osfamily: 'Debian', - puppetversion: Puppet.version, } end let :params do @@ -266,14 +226,7 @@ describe 'apt::source' do context 'with architecture fact and unset architecture parameter' do let :facts do - { - architecture: 'amd64', - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } + super().merge(architecture: 'amd64') end let :params do { @@ -288,15 +241,6 @@ describe 'apt::source' do end context 'with include_src => true' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let :params do { location: 'hello.there', @@ -310,15 +254,6 @@ describe 'apt::source' do end context 'with include deb => false' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'debian', - lsbdistcodename: 'jessie', - osfamily: 'debian', - puppetversion: Puppet.version, - } - end let :params do { include: { 'deb' => false }, @@ -333,15 +268,6 @@ describe 'apt::source' do end context 'with include src => true and include deb => false' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'debian', - lsbdistcodename: 'jessie', - osfamily: 'debian', - puppetversion: Puppet.version, - } - end let :params do { include: { 'deb' => false, 'src' => true }, @@ -356,15 +282,6 @@ describe 'apt::source' do end context 'with ensure => absent' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let :params do { ensure: 'absent', @@ -381,9 +298,7 @@ describe 'apt::source' do let :facts do { os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', osfamily: 'Debian', - puppetversion: Puppet.version, } end let(:params) { { location: 'hello.there' } } @@ -394,29 +309,12 @@ describe 'apt::source' do end context 'with release is empty string' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let(:params) { { location: 'hello.there', release: '' } } it { is_expected.to contain_apt__setting('list-my_source').with_content(%r{hello\.there main}) } end context 'with invalid pin' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let :params do { location: 'hello.there', @@ -430,15 +328,6 @@ describe 'apt::source' do end context 'with notify_update = undef (default)' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let :params do { location: 'hello.there', @@ -449,15 +338,6 @@ describe 'apt::source' do end context 'with notify_update = true' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let :params do { location: 'hello.there', @@ -469,15 +349,6 @@ describe 'apt::source' do end context 'with notify_update = false' do - let :facts do - { - os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, - lsbdistid: 'Debian', - lsbdistcodename: 'jessie', - osfamily: 'Debian', - puppetversion: Puppet.version, - } - end let :params do { location: 'hello.there', -- 2.32.3