diff options
author | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-05-25 14:39:13 +0200 |
---|---|---|
committer | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-05-25 14:39:13 +0200 |
commit | 6a382f13ad3c2e9b6e39054c1e5c10edc5292b5d (patch) | |
tree | 60b579fb5e587dd1c064d48995789697c7db8926 | |
parent | bc6ff0fc25fb5e850f54e6c9a0beca0d79ea4a29 (diff) | |
download | puppet-dhcp-6a382f13ad3c2e9b6e39054c1e5c10edc5292b5d.tar.gz puppet-dhcp-6a382f13ad3c2e9b6e39054c1e5c10edc5292b5d.tar.bz2 |
Add workaround for unit tests on Puppet 4 [skip ci]
-rw-r--r-- | spec/spec_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 86cc740..c5b11ae 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -35,7 +35,7 @@ Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules') # ticket https://tickets.puppetlabs.com/browse/MODULES-823 # ver = Gem::Version.new(Puppet.version.split('-').first) -if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver +if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver || Gem::Requirement.new("~> 4.0") puts "augeasproviders: setting Puppet[:libdir] to work around broken type autoloading" # libdir is only a single dir, so it can only workaround loading of one external module Puppet[:libdir] = "#{Puppet[:modulepath]}/augeasproviders_core/lib" |