diff options
author | Jesse Wolfe <jes5199@gmail.com> | 2010-05-21 15:19:49 -0700 |
---|---|---|
committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
commit | 7952af5b80331f60d9f3703e63285fc7fb733a8c (patch) | |
tree | 74b7a45df019223de872469395cc2ef51574a3c1 | |
parent | f35c59f83b8df2e595ec44a6258dbae30c81237e (diff) | |
download | puppet-7952af5b80331f60d9f3703e63285fc7fb733a8c.tar.gz puppet-7952af5b80331f60d9f3703e63285fc7fb733a8c.tar.xz puppet-7952af5b80331f60d9f3703e63285fc7fb733a8c.zip |
[#3674] Autoloader should propagate failures
Change Autoloader's loadall to re-raise exceptions that happen when
trying to load files, rather than just warning.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
-rw-r--r-- | lib/puppet/util/autoload.rb | 2 | ||||
-rwxr-xr-x | spec/unit/util/autoload.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb index 4a687bf34..006554d5a 100644 --- a/lib/puppet/util/autoload.rb +++ b/lib/puppet/util/autoload.rb @@ -123,7 +123,7 @@ class Puppet::Util::Autoload raise rescue Exception => detail puts detail.backtrace if Puppet[:trace] - warn "Could not autoload #{file}: #{detail}" + raise Puppet::Error, "Could not autoload #{file}: #{detail}" end end end diff --git a/spec/unit/util/autoload.rb b/spec/unit/util/autoload.rb index 5862073ea..1b8866246 100755 --- a/spec/unit/util/autoload.rb +++ b/spec/unit/util/autoload.rb @@ -113,10 +113,10 @@ describe Puppet::Util::Autoload do end [RuntimeError, LoadError, SyntaxError].each do |error| - it "should not die an if a #{error.to_s} exception is thrown" do + it "should die an if a #{error.to_s} exception is thrown" do Kernel.expects(:require).raises error - lambda { @autoload.loadall }.should_not raise_error + lambda { @autoload.loadall }.should raise_error(Puppet::Error) end end |