From: Paula McMaw Date: Fri, 17 Nov 2017 12:16:30 +0000 (+0000) Subject: Module sync 1d81b6a X-Git-Tag: 1.11.0~4^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fe270e5161e52538ddc787d37bf9da3f3dfbdf0a;p=puppet-modules%2Fpuppetlabs-firewall.git Module sync 1d81b6a --- diff --git a/.travis.yml b/.travis.yml index 98fc619..adc67f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: script: bundle exec rake beaker services: docker sudo: required - - rvm: 2.4.0 + - rvm: 2.4.1 bundler_args: --without system_tests env: PUPPET_GEM_VERSION="~> 5.0" - rvm: 2.1.9 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 05732d4..c808092 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,4 @@ -#This file is generated by ModuleSync, do not edit. +# This file is generated by ModuleSync, do not edit. require 'puppetlabs_spec_helper/module_spec_helper' if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0 @@ -12,5 +12,6 @@ end # put local configuration and setup into spec_helper_local begin require 'spec_helper_local' -rescue LoadError +rescue LoadError => loaderror + puts "Could not require spec_helper_local: #{loaderror.message}" end