Merge pull request puppetlabs#1664 from mmoll/sendfile_re

use Enum instead of validate_re for $sendfile
cegeka · Aug 25, 2017 · 92215e3 · 92215e3
2 parents 4a65949 + 7869814
commit 92215e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -38,7 +38,7 @@
   $purge_vhost_dir                                               = undef,
   $purge_vdir                                                    = false,
   $serveradmin                                                   = 'root@localhost',
-  $sendfile                                                      = 'On',
+  Enum['On', 'Off', 'on', 'off'] $sendfile                       = 'On',
   $error_documents                                               = false,
   $timeout                                                       = '120',
   $httpd_dir                                                     = $::apache::params::httpd_dir,
@@ -129,7 +129,6 @@
       notify => Class['Apache::Service'],
     }
   }
-  validate_re($sendfile, [ '^[oO]n$' , '^[oO]ff$' ])
 
   # declare the web server user and group
   # Note: requiring the package means the package ought to create them and not puppet

diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
@@ -636,7 +636,7 @@
         it "should fail" do
           expect do
             catalogue
-          end.to raise_error(Puppet::Error, /"foo" does not match/)
+          end.to raise_error(Puppet::PreformattedError, /Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Enum\['Off', 'On', 'off', 'on'\], got 'foo'/)
         end
       end
       context "On" do