[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[Jesse Wolfe]

The following commit has been merged in the upstream branch:
commit 4b55fb07741c3f3c3fbad21218acc061671a7c68
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Mon Mar 22 17:53:55 2010 -0700

    bug #3407 Part 2
    
    My change to the Puppet::Module::InvalidName error's initializer broke a
    spec in a different file.
    
    Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>

diff --git a/spec/unit/parser/files.rb b/spec/unit/parser/files.rb
index 4d25f7c..42953b7 100644
--- a/spec/unit/parser/files.rb
+++ b/spec/unit/parser/files.rb
@@ -121,7 +121,7 @@ describe Puppet::Parser::Files do
     describe "when searching for manifests" do
         it "should ignore invalid modules" do
             mod = mock 'module'
-            Puppet::Node::Environment.new.expects(:module).with("mymod").raises Puppet::Module::InvalidName
+            Puppet::Node::Environment.new.expects(:module).with("mymod").raises(Puppet::Module::InvalidName, "name is invalid")
             Puppet.expects(:value).with(:modulepath).never
             Dir.stubs(:glob).returns %w{foo}
 

-- 
Puppet packaging for Debian