From 3fba56bd8ab36e4862f9ea7b2e9cc69206271531 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 4 Nov 2020 19:07:21 +0100 Subject: [PATCH] Drop concat_basedir fact in tests This fact hasn't existed since puppetlabs-concat 2.x as released in 2016. 6d827ec1d37c3012d6a44826878cbef558163b7f dropped support for those 1.x versions which means this hasn't been needed for a while. --- spec/unit/classes/server/config_spec.rb | 5 ----- spec/unit/classes/server/contrib_spec.rb | 1 - spec/unit/classes/server/initdb_spec.rb | 5 ----- spec/unit/classes/server/plperl_spec.rb | 1 - spec/unit/classes/server/plpython_spec.rb | 1 - spec/unit/classes/server/postgis_spec.rb | 1 - spec/unit/classes/server_spec.rb | 1 - spec/unit/defines/server/config_entry_spec.rb | 5 ----- spec/unit/defines/server/database_grant_spec.rb | 1 - spec/unit/defines/server/database_spec.rb | 1 - spec/unit/defines/server/db_spec.rb | 1 - spec/unit/defines/server/extension_spec.rb | 3 --- spec/unit/defines/server/grant_role_spec.rb | 4 ++-- spec/unit/defines/server/grant_spec.rb | 1 - spec/unit/defines/server/pg_hba_rule_spec.rb | 1 - spec/unit/defines/server/pg_ident_rule_spec.rb | 1 - spec/unit/defines/server/reassign_owned_by_spec.rb | 1 - spec/unit/defines/server/recovery_spec.rb | 1 - spec/unit/defines/server/role_spec.rb | 1 - spec/unit/defines/server/schema_spec.rb | 1 - spec/unit/defines/server/table_grant_spec.rb | 1 - spec/unit/defines/server/tablespace_spec.rb | 1 - 22 files changed, 2 insertions(+), 37 deletions(-) diff --git a/spec/unit/classes/server/config_spec.rb b/spec/unit/classes/server/config_spec.rb index e5bd26bd3c..65a848bf09 100644 --- a/spec/unit/classes/server/config_spec.rb +++ b/spec/unit/classes/server/config_spec.rb @@ -8,7 +8,6 @@ describe 'on RedHat 7' do let(:facts) do { - concat_basedir: tmpfilename('server'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', @@ -75,7 +74,6 @@ class { 'postgresql::server': } describe 'on Fedora 21' do let(:facts) do { - concat_basedir: tmpfilename('server'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', @@ -148,7 +146,6 @@ class { 'postgresql::server': } release: { 'full' => '1.0' }, selinux: { 'enabled' => true }, }, - concat_basedir: tmpfilename('server'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', @@ -184,7 +181,6 @@ class { 'postgresql::server': } selinux: { 'enabled' => true }, }, osfamily: 'Gentoo', - concat_basedir: tmpfilename('server'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', @@ -231,7 +227,6 @@ class { 'postgresql::server': release: { 'full' => '7.0' }, selinux: { 'enabled' => true }, }, - concat_basedir: tmpfilename('server'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', diff --git a/spec/unit/classes/server/contrib_spec.rb b/spec/unit/classes/server/contrib_spec.rb index 08df3ddfbd..c177a02a8b 100644 --- a/spec/unit/classes/server/contrib_spec.rb +++ b/spec/unit/classes/server/contrib_spec.rb @@ -13,7 +13,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('contrib'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/classes/server/initdb_spec.rb b/spec/unit/classes/server/initdb_spec.rb index 17456f4dcd..156246225b 100644 --- a/spec/unit/classes/server/initdb_spec.rb +++ b/spec/unit/classes/server/initdb_spec.rb @@ -14,7 +14,6 @@ release: { 'full' => '6.0' }, selinux: { 'enabled' => true }, }, - concat_basedir: tmpfilename('server'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', @@ -55,7 +54,6 @@ class {'postgresql::server': release: { 'full' => '1.0' }, selinux: { 'enabled' => true }, }, - concat_basedir: tmpfilename('server'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', @@ -88,7 +86,6 @@ class {'postgresql::server': release: { 'full' => '6.0' }, selinux: { 'enabled' => true }, }, - concat_basedir: tmpfilename('server'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', @@ -120,7 +117,6 @@ class { 'postgresql::server': } release: { 'full' => '6.0' }, selinux: { 'enabled' => true }, }, - concat_basedir: tmpfilename('server'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', @@ -151,7 +147,6 @@ class { 'postgresql::server': } release: { 'full' => '6.0' }, selinux: { 'enabled' => true }, }, - concat_basedir: tmpfilename('server'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', diff --git a/spec/unit/classes/server/plperl_spec.rb b/spec/unit/classes/server/plperl_spec.rb index cca441b529..ca3a8299ff 100644 --- a/spec/unit/classes/server/plperl_spec.rb +++ b/spec/unit/classes/server/plperl_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('plperl'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/classes/server/plpython_spec.rb b/spec/unit/classes/server/plpython_spec.rb index 9a991ef26d..b1619ed47a 100644 --- a/spec/unit/classes/server/plpython_spec.rb +++ b/spec/unit/classes/server/plpython_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '6.8' }, selinux: { 'enabled' => true }, }, - concat_basedir: tmpfilename('plpython'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', diff --git a/spec/unit/classes/server/postgis_spec.rb b/spec/unit/classes/server/postgis_spec.rb index 343b135e6c..e3449b7843 100644 --- a/spec/unit/classes/server/postgis_spec.rb +++ b/spec/unit/classes/server/postgis_spec.rb @@ -13,7 +13,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('postgis'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/classes/server_spec.rb b/spec/unit/classes/server_spec.rb index 2aa165dbb6..1151946d29 100644 --- a/spec/unit/classes/server_spec.rb +++ b/spec/unit/classes/server_spec.rb @@ -15,7 +15,6 @@ osfamily: 'Debian', lsbdistid: 'Debian', lsbdistcodename: 'jessie', - concat_basedir: tmpfilename('server'), kernel: 'Linux', id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', diff --git a/spec/unit/defines/server/config_entry_spec.rb b/spec/unit/defines/server/config_entry_spec.rb index c139c78d6f..8c8721de62 100644 --- a/spec/unit/defines/server/config_entry_spec.rb +++ b/spec/unit/defines/server/config_entry_spec.rb @@ -10,7 +10,6 @@ selinux: { 'enabled' => true }, }, kernel: 'Linux', - concat_basedir: tmpfilename('contrib'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', selinux: true, @@ -44,7 +43,6 @@ selinux: { 'enabled' => true }, }, kernel: 'Linux', - concat_basedir: tmpfilename('contrib'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', selinux: true, @@ -69,7 +67,6 @@ selinux: { 'enabled' => true }, }, kernel: 'Linux', - concat_basedir: tmpfilename('contrib'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', selinux: true, @@ -94,7 +91,6 @@ selinux: { 'enabled' => true }, }, kernel: 'Linux', - concat_basedir: tmpfilename('contrib'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', selinux: true, @@ -141,7 +137,6 @@ selinux: { 'enabled' => true }, }, kernel: 'Linux', - concat_basedir: tmpfilename('contrib'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', selinux: true, diff --git a/spec/unit/defines/server/database_grant_spec.rb b/spec/unit/defines/server/database_grant_spec.rb index c5201ec437..f2c4c3452f 100644 --- a/spec/unit/defines/server/database_grant_spec.rb +++ b/spec/unit/defines/server/database_grant_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('contrib'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/database_spec.rb b/spec/unit/defines/server/database_spec.rb index 276205f8d2..1b1eee6d72 100644 --- a/spec/unit/defines/server/database_spec.rb +++ b/spec/unit/defines/server/database_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('contrib'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/db_spec.rb b/spec/unit/defines/server/db_spec.rb index 804b949ebe..0db5ff62f1 100644 --- a/spec/unit/defines/server/db_spec.rb +++ b/spec/unit/defines/server/db_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('contrib'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/extension_spec.rb b/spec/unit/defines/server/extension_spec.rb index c6c2a00787..8d566288d7 100644 --- a/spec/unit/defines/server/extension_spec.rb +++ b/spec/unit/defines/server/extension_spec.rb @@ -16,7 +16,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('postgis'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } @@ -134,7 +133,6 @@ release: { 'full' => '6.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('postgis'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } @@ -169,7 +167,6 @@ release: { 'full' => '6.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('postgis'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/grant_role_spec.rb b/spec/unit/defines/server/grant_role_spec.rb index 73934b1998..2ddd9a16b2 100644 --- a/spec/unit/defines/server/grant_role_spec.rb +++ b/spec/unit/defines/server/grant_role_spec.rb @@ -12,9 +12,9 @@ name: 'Debian', release: { 'full' => '8.0' }, }, - kernel: 'Linux', concat_basedir: tmpfilename('postgis'), + kernel: 'Linux', id: 'root', - path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' + path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } end diff --git a/spec/unit/defines/server/grant_spec.rb b/spec/unit/defines/server/grant_spec.rb index 664f93af6c..7130903836 100644 --- a/spec/unit/defines/server/grant_spec.rb +++ b/spec/unit/defines/server/grant_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('contrib'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/pg_hba_rule_spec.rb b/spec/unit/defines/server/pg_hba_rule_spec.rb index e948db4da2..63a3167b58 100644 --- a/spec/unit/defines/server/pg_hba_rule_spec.rb +++ b/spec/unit/defines/server/pg_hba_rule_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('pg_hba'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/pg_ident_rule_spec.rb b/spec/unit/defines/server/pg_ident_rule_spec.rb index f7fce23a2c..57f687205e 100644 --- a/spec/unit/defines/server/pg_ident_rule_spec.rb +++ b/spec/unit/defines/server/pg_ident_rule_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('pg_ident'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/reassign_owned_by_spec.rb b/spec/unit/defines/server/reassign_owned_by_spec.rb index 338e754d09..5c933944ac 100644 --- a/spec/unit/defines/server/reassign_owned_by_spec.rb +++ b/spec/unit/defines/server/reassign_owned_by_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('reassign_owned_by'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/recovery_spec.rb b/spec/unit/defines/server/recovery_spec.rb index c1a36d0ecc..48af4c1a9b 100644 --- a/spec/unit/defines/server/recovery_spec.rb +++ b/spec/unit/defines/server/recovery_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('recovery'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/role_spec.rb b/spec/unit/defines/server/role_spec.rb index 42801fab48..54f81b64fe 100644 --- a/spec/unit/defines/server/role_spec.rb +++ b/spec/unit/defines/server/role_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('contrib'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/schema_spec.rb b/spec/unit/defines/server/schema_spec.rb index eaa0ff63ee..76d1fcdad0 100644 --- a/spec/unit/defines/server/schema_spec.rb +++ b/spec/unit/defines/server/schema_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('schema'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/table_grant_spec.rb b/spec/unit/defines/server/table_grant_spec.rb index 2bc22cc126..2188509899 100644 --- a/spec/unit/defines/server/table_grant_spec.rb +++ b/spec/unit/defines/server/table_grant_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('table_grant'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', } diff --git a/spec/unit/defines/server/tablespace_spec.rb b/spec/unit/defines/server/tablespace_spec.rb index 87ca34255c..6a99e6f8ff 100644 --- a/spec/unit/defines/server/tablespace_spec.rb +++ b/spec/unit/defines/server/tablespace_spec.rb @@ -9,7 +9,6 @@ release: { 'full' => '8.0' }, }, kernel: 'Linux', - concat_basedir: tmpfilename('tablespace'), id: 'root', path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', }