[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 718a87a436dd9b14d78e8b0220da471b7c7b282a
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Mon Mar 22 14:18:40 2010 -0700

    Bug #3402 Stub returning invalid type for :noop
    
    A stub was causing a test failure by returning a string for a parameter
    that requires a boolean.

diff --git a/spec/unit/indirector/ssl_file.rb b/spec/unit/indirector/ssl_file.rb
index 7a9d629..8f46409 100755
--- a/spec/unit/indirector/ssl_file.rb
+++ b/spec/unit/indirector/ssl_file.rb
@@ -21,7 +21,7 @@ describe Puppet::Indirector::SslFile do
         @setting = :mydir
         @file_class.store_in @setting
         @path = "/my/directory"
-        Puppet.settings.stubs(:value).returns "stubbed_setting"
+        Puppet.settings.stubs(:value).with(:noop).returns(false)
         Puppet.settings.stubs(:value).with(@setting).returns(@path)
         Puppet.settings.stubs(:value).with(:trace).returns(false)
     end
@@ -198,6 +198,7 @@ describe Puppet::Indirector::SslFile do
                 it "should use the filehandle provided by the Settings" do
                     @searcher.class.store_at @setting
                     @searcher.class.store_ca_at :castuff
+                    Puppet.settings.stubs(:value).with(:castuff).returns "castuff stub"
 
                     fh = mock 'filehandle'
                     fh.stubs :print

-- 
Puppet packaging for Debian