MODULES-3211: fix broken strict_variable tests

puppetlabs · Mar 30, 2016 · d1a4d3b · d1a4d3b
1 parent 3bdf98f
commit d1a4d3b
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 13 deletions.
diff --git a/manifests/dev.pp b/manifests/dev.pp
@@ -1,5 +1,9 @@
 class apache::dev {
-  include ::apache::params
+
+  if ! defined(Class['apache']) {
+    fail('You must include the apache base class before using any apache defined resources')
+  }
+
   $packages = $::apache::dev_packages
   if $packages { # FreeBSD doesn't have dev packages to install
     package { $packages:

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -488,6 +488,7 @@
     $docroot              = '/var/www/localhost/htdocs'
     $alias_icons_path     = '/usr/share/apache2/icons'
     $error_documents_path = '/usr/share/apache2/error'
+    $pidfile              = undef
   } elsif $::osfamily == 'Suse' {
     $user                = 'wwwrun'
     $group               = 'wwwrun'

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -493,6 +493,8 @@
     }
 
     $_directories = [ merge($_directory, $_directory_version) ]
+  } else {
+    $_directories = undef
   }
 
   ## Create a global LocationMatch if locations aren't defined

diff --git a/spec/classes/mod/dav_svn_spec.rb b/spec/classes/mod/dav_svn_spec.rb
@@ -34,7 +34,7 @@
           :id                        => 'root',
           :kernel                    => 'Linux',
           :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          :is_pe                     => false,
         }
       end
       it { is_expected.to contain_class("apache::params") }
@@ -52,7 +52,7 @@
           :id                        => 'root',
           :kernel                    => 'Linux',
           :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-          :is_pe                  => false,
+          :is_pe                     => false,
         }
       end
       it { is_expected.to contain_class("apache::params") }

diff --git a/spec/classes/mod/dev_spec.rb b/spec/classes/mod/dev_spec.rb
@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe 'apache::mod::dev', :type => :class do
+  let(:pre_condition) {[
+    'include apache'
+  ]}
+
   it_behaves_like "a mod class, without including apache"
 
   [

diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
@@ -25,7 +25,7 @@
         :kernel          => 'Linux',
         :path            => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :hardwaremodel   => 'i386',
-        :is_pe                  => false,
+        :is_pe           => false,
       }
     end
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -25,16 +25,23 @@
 shared_examples 'a mod class, without including apache' do
    let :facts do
     {
-      :id                     => 'root',
-      :lsbdistcodename        => 'squeeze',
-      :kernel                 => 'Linux',
-      :osfamily               => 'Debian',
-      :operatingsystem        => 'Debian',
-      :operatingsystemrelease => '6',
-      :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      :concat_basedir         => '/dne',
-      :is_pe                  => false,
+      :id                        => 'root',
+      :lsbdistcodename           => 'squeeze',
+      :kernel                    => 'Linux',
+      :osfamily                  => 'Debian',
+      :operatingsystem           => 'Debian',
+      :operatingsystemrelease    => '6',
+      :operatingsystemmajrelease => nil,
+      :path                      => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      :concat_basedir            => '/dne',
+      :is_pe                     => false,
+      :hardwaremodel             => 'x86_64',
     }
   end
   it { should compile.with_all_deps }
 end
+
+RSpec.configure do |config|
+    config.filter_run focus: true
+    config.run_all_when_everything_filtered = true
+end