Merge pull request puppetlabs#1203 from ekohl/drop-concat-basedir

sheenaajay · web-flow · commit 099ed0559abf · 2020-11-09T09:47:46.000Z
Drop concat_basedir fact in tests
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',
     }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`release: { 'full' => '8.0' },`
`14`	`14`	`},`
`15`	`15`	`kernel: 'Linux',`
`16`		`- concat_basedir: tmpfilename('contrib'),`
`17`	`16`	`id: 'root',`
`18`	`17`	`path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`release: { 'full' => '8.0' },`
`10`	`10`	`},`
`11`	`11`	`kernel: 'Linux',`
`12`		`- concat_basedir: tmpfilename('plperl'),`
`13`	`12`	`id: 'root',`
`14`	`13`	`path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',`
`15`	`14`	`}`