From f891ba29ffeafb5ded6fdd26ef7a5bcde219f76a Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Mon, 22 Mar 2010 17:30:40 -0700 Subject: Fixing #3407 Failing tests in spec/unit/node/environment.rb A naked rescue in Puppet::Node::Environment was hiding expectation violations from the Mocha mocks. Specifically, 'modulepath' expectations were failing, as Puppet::Module now calls Puppet::Node::Environment#modulepath internally. Signed-off-by: Jesse Wolfe --- lib/puppet/node/environment.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/puppet/node/environment.rb') diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb index 94f899200..395d50657 100644 --- a/lib/puppet/node/environment.rb +++ b/lib/puppet/node/environment.rb @@ -62,7 +62,13 @@ class Puppet::Node::Environment # Cache the list, because it can be expensive to create. cached_attr(:modules, :ttl => Puppet[:filetimeout]) do module_names = modulepath.collect { |path| Dir.entries(path) }.flatten.uniq - module_names.collect { |path| Puppet::Module.new(path, self) rescue nil }.compact + module_names.collect do |path| + begin + Puppet::Module.new(path, self) + rescue Puppet::Module::Error => e + nil + end + end.compact end # Cache the manifestdir, so that we aren't searching through -- cgit