Fix all the tests

stephenrjohnson · stephenrjohnson · commit c8ba142e0d02 · 2016-11-14T20:42:33.000Z
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -63,6 +63,7 @@
       $passenger_package            = 'mod_passenger'
       $rack_package                 = 'rubygem-rack'
       $ruby_dev                     = 'ruby-devel'
+      $puppet_facter_package        = nil
     }
     'Suse': {
       $puppet_master_package        = 'puppet-server'
@@ -72,6 +73,7 @@
       $package_provider                 = undef # falls back to system default
       $passenger_package            = 'rubygem-passenger-apache2'
       $rack_package                 = 'rubygem-rack'
+      $puppet_facter_package        = nil
     }
     'Debian': {
       $puppet_master_package        = 'puppetmaster'
@@ -83,12 +85,14 @@
       $passenger_package            = 'libapache2-mod-passenger'
       $rack_package                 = 'librack-ruby'
       $ruby_dev                     = 'ruby-dev'
+      $puppet_facter_package        = nil
     }
     'FreeBSD': {
       $puppet_agent_service         = 'puppet'
       $puppet_agent_package         = 'sysutils/puppet'
       $package_provider                 = undef # falls back to system default
       $puppet_conf                  = '/usr/local/etc/puppet/puppet.conf'
+      $puppet_facter_package        = nil
     }
     'Darwin': {
       $puppet_agent_service         = 'com.puppetlabs.puppet'
diff --git a/manifests/passenger.pp b/manifests/passenger.pp
@@ -143,8 +143,8 @@
     ssl_chain            => "${puppet_ssldir}/ca/ca_crt.pem",
     ssl_ca               => "${puppet_ssldir}/ca/ca_crt.pem",
     ssl_crl              => "${puppet_ssldir}/ca/ca_crl.pem",
-    ssl_protocol         => $::puppet::params::ssl_protocol,
-    ssl_cipher           => $::puppet::params::ssl_cipher,
+    ssl_protocol         => $puppet_passenger_ssl_protocol,
+    ssl_cipher           => $puppet_passenger_ssl_cipher,
     ssl_honorcipherorder => 'On',
     ssl_verify_client    => 'optional',
     ssl_verify_depth     => '1',
diff --git a/spec/classes/puppet_agent_spec.rb b/spec/classes/puppet_agent_spec.rb
@@ -6,7 +6,8 @@
       {
         :osfamily        => 'Debian',
         :operatingsystem => 'Debian',
-        :kernel          => 'Linux'
+        :kernel          => 'Linux',
+        :puppetversion   => '3.8.0'
       }
     end
 
@@ -167,7 +168,8 @@
       {
         :osfamily        => 'RedHat',
         :operatingsystem => 'RedHat',
-        :kernel          => 'Linux'
+        :kernel          => 'Linux',
+        :puppetversion   => '3.8.0'
       }
     end
     describe 'when installed' do
@@ -327,7 +329,8 @@
       {
         :osfamily        => 'RedHat',
         :operatingsystem => 'RedHat',
-        :kernel          => 'Linux'
+        :kernel          => 'Linux',
+        :puppetversion   => '3.8.0'
       }
     end
     context 'with ordering set' do
@@ -389,7 +392,8 @@
       {
         :osfamily        => 'RedHat',
         :operatingsystem => 'RedHat',
-        :kernel          => 'Linux'
+        :kernel          => 'Linux',
+        :puppetversion   => '3.8.0'
       }
     end
     context 'with trusted set' do
@@ -451,7 +455,8 @@
       {
         :osfamily        => 'RedHat',
         :operatingsystem => 'RedHat',
-        :kernel          => 'Linux'
+        :kernel          => 'Linux',
+        :puppetversion   => '3.8.0'
       }
     end
     context 'with templatedir set' do
@@ -513,7 +518,8 @@
       {
         :osfamily        => 'RedHat',
         :operatingsystem => 'RedHat',
-        :kernel          => 'Linux'
+        :kernel          => 'Linux',
+        :puppetversion   => '3.8.0'
       }
     end
     context 'with configtimeout set' do
@@ -556,7 +562,8 @@
       {
         :osfamily        => 'RedHat',
         :operatingsystem => 'RedHat',
-        :kernel          => 'Linux'
+        :kernel          => 'Linux',
+        :puppetversion   => '3.8.0'
       }
     end
     context 'with stringify_facts set' do
@@ -582,7 +589,8 @@
       {
         :osfamily        => 'RedHat',
         :operatingsystem => 'RedHat',
-        :kernel          => 'Linux'
+        :kernel          => 'Linux',
+        :puppetversion   => '3.8.0'
       }
     end
     context 'with http_proxy_host set' do
@@ -608,7 +616,8 @@
       {
         :osfamily        => 'RedHat',
         :operatingsystem => 'RedHat',
-        :kernel          => 'Linux'
+        :kernel          => 'Linux',
+        :puppetversion   => '3.8.0'
       }
     end
     context 'with http_proxy_port set' do
diff --git a/spec/classes/puppet_master_spec.rb b/spec/classes/puppet_master_spec.rb
@@ -10,7 +10,8 @@
                 :operatingsystemrelease => '5',
                 :concat_basedir => '/nde',
                 :lsbdistcodename => 'lenny',
-                :processorcount => '2'
+                :processorcount => '2',
+                :puppetversion   => '3.8.0'
             }
         end
         let (:params) do
@@ -27,8 +28,7 @@
                 :storeconfigs           => 'true',
                 :storeconfigs_dbserver  => 'test.example.com',
                 :dns_alt_names          => ['puppet'],
-                :strict_variables       => 'true'
-
+                :strict_variables       => 'true',
             }
         end
         it {
@@ -180,7 +180,8 @@
                 :operatingsystem => 'RedHat',
                 :operatingsystemrelease => '6',
                 :concat_basedir => '/nde',
-                :processorcount => '2'
+                :processorcount => '2',
+                :puppetversion   => '3.8.0'
             }
         end
         let (:params) do
@@ -347,7 +348,8 @@
                 :operatingsystem => 'RedHat',
                 :operatingsystemrelease => '6',
                 :concat_basedir => '/nde',
-                :processorcount => '2'
+                :processorcount => '2',
+                :puppetversion   => '3.8.0'
             }
         end
         let (:params) do {
@@ -380,7 +382,8 @@
                 :operatingsystem => 'RedHat',
                 :operatingsystemrelease => '6',
                 :concat_basedir => '/nde',
-                :processorcount => '2'
+                :processorcount => '2',
+                :puppetversion   => '3.8.0'
             }
         end
         let (:params) do {
diff --git a/spec/classes/puppet_passenger_spec.rb b/spec/classes/puppet_passenger_spec.rb
@@ -28,6 +28,7 @@
                 :operatingsystemrelease => '5',
                 :concat_basedir         => '/dne',
                 :lsbdistcodename        => 'lenny',
+                :puppetversion   => '3.8.0'
             }
         end
          it {
@@ -92,6 +93,7 @@
           :operatingsystem        => 'Redhat',
           :operatingsystemrelease => '5',
           :concat_basedir         => '/dne',
+          :puppetversion   => '3.8.0'
         }
       end
       it {
@@ -106,6 +108,7 @@
           :operatingsystem        => 'Redhat',
           :operatingsystemrelease => '5',
           :concat_basedir         => '/dne',
+          :puppetversion   => '3.8.0'
         }
       end
       let (:params) do
diff --git a/spec/classes/puppet_repo_puppetlabs_spec.rb b/spec/classes/puppet_repo_puppetlabs_spec.rb
@@ -11,7 +11,7 @@
       }
     end
     let(:key_hash) { {
-      'id'     => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+      'id'     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
       'server' => 'pgp.mit.edu',
     } }
     it 'should contain puppetlabs apt repos' do
diff --git a/spec/classes/puppet_storeconfigs_spec.rb b/spec/classes/puppet_storeconfigs_spec.rb
@@ -7,6 +7,7 @@
             {
                 :osfamily        => 'Debian',
                 :operatingsystem => 'Debian',
+                :puppetversion   => '3.8.0'
             }
         end
         let (:params) do
@@ -34,6 +35,7 @@
             {
                 :osfamily        => 'Debian',
                 :operatingsystem => 'Debian',
+                :puppetversion   => '3.8.0'
             }
         end
         let (:params) do
diff --git a/spec/defines/puppet_masterenv_spec.rb b/spec/defines/puppet_masterenv_spec.rb
@@ -15,7 +15,9 @@
       {
         :manifest        => '/etc/puppet/environments/dev.pp',
         :modulepath      => '/etc/puppet/environments/modules/',
-        :puppet_conf     => '/etc/puppet/puppet.conf'
+        :puppet_conf     => '/etc/puppet/puppet.conf',
+        :environments    => 'config',
+        :environmentpath => ''
       }
     end
     it {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`{`
`7`	`7`	`:osfamily => 'Debian',`
`8`	`8`	`:operatingsystem => 'Debian',`
`9`		`- :kernel => 'Linux'`
	`9`	`+ :kernel => 'Linux',`
	`10`	`+ :puppetversion => '3.8.0'`
`10`	`11`	`}`
`11`	`12`	`end`
`12`	`13`
`@@ -167,7 +168,8 @@`
`167`	`168`	`{`
`168`	`169`	`:osfamily => 'RedHat',`
`169`	`170`	`:operatingsystem => 'RedHat',`
`170`		`- :kernel => 'Linux'`
	`171`	`+ :kernel => 'Linux',`
	`172`	`+ :puppetversion => '3.8.0'`
`171`	`173`	`}`
`172`	`174`	`end`
`173`	`175`	`describe 'when installed' do`
`@@ -327,7 +329,8 @@`
`327`	`329`	`{`
`328`	`330`	`:osfamily => 'RedHat',`
`329`	`331`	`:operatingsystem => 'RedHat',`
`330`		`- :kernel => 'Linux'`
	`332`	`+ :kernel => 'Linux',`
	`333`	`+ :puppetversion => '3.8.0'`
`331`	`334`	`}`
`332`	`335`	`end`
`333`	`336`	`context 'with ordering set' do`
`@@ -389,7 +392,8 @@`
`389`	`392`	`{`
`390`	`393`	`:osfamily => 'RedHat',`
`391`	`394`	`:operatingsystem => 'RedHat',`
`392`		`- :kernel => 'Linux'`
	`395`	`+ :kernel => 'Linux',`
	`396`	`+ :puppetversion => '3.8.0'`
`393`	`397`	`}`
`394`	`398`	`end`
`395`	`399`	`context 'with trusted set' do`
`@@ -451,7 +455,8 @@`
`451`	`455`	`{`
`452`	`456`	`:osfamily => 'RedHat',`
`453`	`457`	`:operatingsystem => 'RedHat',`
`454`		`- :kernel => 'Linux'`
	`458`	`+ :kernel => 'Linux',`
	`459`	`+ :puppetversion => '3.8.0'`
`455`	`460`	`}`
`456`	`461`	`end`
`457`	`462`	`context 'with templatedir set' do`
`@@ -513,7 +518,8 @@`
`513`	`518`	`{`
`514`	`519`	`:osfamily => 'RedHat',`
`515`	`520`	`:operatingsystem => 'RedHat',`
`516`		`- :kernel => 'Linux'`
	`521`	`+ :kernel => 'Linux',`
	`522`	`+ :puppetversion => '3.8.0'`
`517`	`523`	`}`
`518`	`524`	`end`
`519`	`525`	`context 'with configtimeout set' do`
`@@ -556,7 +562,8 @@`
`556`	`562`	`{`
`557`	`563`	`:osfamily => 'RedHat',`
`558`	`564`	`:operatingsystem => 'RedHat',`
`559`		`- :kernel => 'Linux'`
	`565`	`+ :kernel => 'Linux',`
	`566`	`+ :puppetversion => '3.8.0'`
`560`	`567`	`}`
`561`	`568`	`end`
`562`	`569`	`context 'with stringify_facts set' do`
`@@ -582,7 +589,8 @@`
`582`	`589`	`{`
`583`	`590`	`:osfamily => 'RedHat',`
`584`	`591`	`:operatingsystem => 'RedHat',`
`585`		`- :kernel => 'Linux'`
	`592`	`+ :kernel => 'Linux',`
	`593`	`+ :puppetversion => '3.8.0'`
`586`	`594`	`}`
`587`	`595`	`end`
`588`	`596`	`context 'with http_proxy_host set' do`
`@@ -608,7 +616,8 @@`
`608`	`616`	`{`
`609`	`617`	`:osfamily => 'RedHat',`
`610`	`618`	`:operatingsystem => 'RedHat',`
`611`		`- :kernel => 'Linux'`
	`619`	`+ :kernel => 'Linux',`
	`620`	`+ :puppetversion => '3.8.0'`
`612`	`621`	`}`
`613`	`622`	`end`
`614`	`623`	`context 'with http_proxy_port set' do`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`}`
`12`	`12`	`end`
`13`	`13`	`let(:key_hash) { {`
`14`		`- 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',`
	`14`	`+ 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F',`
`15`	`15`	`'server' => 'pgp.mit.edu',`
`16`	`16`	`} }`
`17`	`17`	`it 'should contain puppetlabs apt repos' do`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`{`
`8`	`8`	`:osfamily => 'Debian',`
`9`	`9`	`:operatingsystem => 'Debian',`
	`10`	`+ :puppetversion => '3.8.0'`
`10`	`11`	`}`
`11`	`12`	`end`
`12`	`13`	`let (:params) do`
`@@ -34,6 +35,7 @@`
`34`	`35`	`{`
`35`	`36`	`:osfamily => 'Debian',`
`36`	`37`	`:operatingsystem => 'Debian',`
	`38`	`+ :puppetversion => '3.8.0'`
`37`	`39`	`}`
`38`	`40`	`end`
`39`	`41`	`let (:params) do`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@`
`15`	`15`	`{`
`16`	`16`	`:manifest => '/etc/puppet/environments/dev.pp',`
`17`	`17`	`:modulepath => '/etc/puppet/environments/modules/',`
`18`		`- :puppet_conf => '/etc/puppet/puppet.conf'`
	`18`	`+ :puppet_conf => '/etc/puppet/puppet.conf',`
	`19`	`+ :environments => 'config',`
	`20`	`+ :environmentpath => ''`
`19`	`21`	`}`
`20`	`22`	`end`
`21`	`23`	`it {`