puppet 0.25.4 → 0.25.5

data/spec/unit/resource/catalog.rb

@@ -578,7 +578,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
             @transaction = mock 'transaction'
             Puppet::Transaction.stubs(:new).returns(@transaction)
             @transaction.stubs(:evaluate)
-            @transaction.stubs(:cleanup)
             @transaction.stubs(:addtimes)
         end
 
@@ -595,11 +594,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
             @catalog.apply
         end
 
-        it "should clean up the transaction" do
-            @transaction.expects :cleanup
-            @catalog.apply
-        end
-
         it "should return the transaction" do
             @catalog.apply.should equal(@transaction)
         end
@@ -624,37 +618,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
             @catalog.apply(:ignoreschedules => true)
         end
 
-        it "should remove resources created mid-transaction" do
-            args = {:name => "/yay", :ensure => :file}
-            resource = stub 'file', :ref => "File[/yay]", :catalog= => @catalog, :title => "/yay", :[] => "/yay"
-            @transaction = mock 'transaction'
-            Puppet::Transaction.stubs(:new).returns(@transaction)
-            @transaction.stubs(:evaluate)
-            @transaction.stubs(:cleanup)
-            @transaction.stubs(:addtimes)
-            Puppet::Type.type(:file).expects(:new).with(args).returns(resource)
-            resource.expects :remove
-            @catalog.apply do |trans|
-                @catalog.create_resource :file, args
-                @catalog.resource("File[/yay]").should equal(resource)
-            end
-            @catalog.resource("File[/yay]").should be_nil
-        end
-
-        it "should remove resources added mid-transaction" do
-            @transaction = mock 'transaction'
-            Puppet::Transaction.stubs(:new).returns(@transaction)
-            @transaction.stubs(:evaluate)
-            @transaction.stubs(:cleanup)
-            @transaction.stubs(:addtimes)
-            file = Puppet::Type.type(:file).new(:name => "/yay", :ensure => :file)
-            @catalog.apply do |trans|
-                @catalog.add_resource file
-                @catalog.resource("File[/yay]").should_not be_nil
-            end
-            @catalog.resource("File[/yay]").should be_nil
-        end
-
         it "should expire cached data in the resources both before and after the transaction" do
             @catalog.expects(:expire).times(2)
             @catalog.apply
@@ -832,6 +795,8 @@ describe Puppet::Resource::Catalog, "when compiling" do
 
     describe "when indirecting" do
         before do
+            @real_indirection = Puppet::Resource::Catalog.indirection
+
             @indirection = stub 'indirection', :name => :catalog
 
             Puppet::Util::Cacher.expire
@@ -843,12 +808,24 @@ describe Puppet::Resource::Catalog, "when compiling" do
             Puppet::Resource::Catalog.find(:myconfig)
         end
 
-        it "should default to the 'compiler' terminus" do
-            Puppet::Resource::Catalog.indirection.terminus_class.should == :compiler
+        it "should use the value of the 'catalog_terminus' setting to determine its terminus class" do
+            # Puppet only checks the terminus setting the first time you ask
+            # so this returns the object to the clean state
+            # at the expense of making this test less pure
+            Puppet::Resource::Catalog.indirection.reset_terminus_class
+
+            Puppet.settings[:catalog_terminus] = "rest"
+            Puppet::Resource::Catalog.indirection.terminus_class.should == :rest
+        end
+
+        it "should allow the terminus class to be set manually" do
+            Puppet::Resource::Catalog.indirection.terminus_class = :rest
+            Puppet::Resource::Catalog.indirection.terminus_class.should == :rest
         end
 
         after do
             Puppet::Util::Cacher.expire
+            @real_indirection.reset_terminus_class
         end
     end
 

data/spec/unit/simple_graph.rb

@@ -372,6 +372,20 @@ describe Puppet::SimpleGraph do
             edges.should be_include(@edges["a/b"])
             edges.should be_include(@edges["a/c"])
         end
+
+        describe "from generated resources" do
+            before :each do
+                @topsource = stub 'source'
+                @edges["a/topsource"] = Puppet::Relationship.new(@topsource, "a", {:event => :yay, :callback => :refresh})
+                @graph.add_edge(@edges["a/topsource"])
+            end
+
+            it "should not match with edges pointing back to events sources" do
+                @edges["a/b"].expects(:match?).never
+                @edges["a/topsource"].expects(:match?)
+                @graph.matching_edges([@event], @topsource)
+            end
+        end
     end
 
     describe "when determining dependencies" do

data/spec/unit/ssl/host.rb

@@ -90,6 +90,55 @@ describe Puppet::SSL::Host do
         Puppet::SSL::Host.localhost.should equal(two)
     end
 
+    it "should be able to verify its certificate matches its key" do
+        Puppet::SSL::Host.new("foo").should respond_to(:certificate_matches_key?)
+    end
+
+    it "should consider the certificate invalid if it cannot find a key" do
+        host = Puppet::SSL::Host.new("foo")
+        host.expects(:key).returns nil
+
+        host.should_not be_certificate_matches_key
+    end
+
+    it "should consider the certificate invalid if it cannot find a certificate" do
+        host = Puppet::SSL::Host.new("foo")
+        host.expects(:key).returns mock("key")
+        host.expects(:certificate).returns nil
+
+        host.should_not be_certificate_matches_key
+    end
+
+    it "should consider the certificate invalid if the SSL certificate's key verification fails" do
+        host = Puppet::SSL::Host.new("foo")
+
+        key = mock 'key', :content => "private_key"
+        sslcert = mock 'sslcert'
+        certificate = mock 'cert', :content => sslcert
+
+        host.stubs(:key).returns key
+        host.stubs(:certificate).returns certificate
+
+        sslcert.expects(:check_private_key).with("private_key").returns false
+
+        host.should_not be_certificate_matches_key
+    end
+
+    it "should consider the certificate valid if the SSL certificate's key verification succeeds" do
+        host = Puppet::SSL::Host.new("foo")
+
+        key = mock 'key', :content => "private_key"
+        sslcert = mock 'sslcert'
+        certificate = mock 'cert', :content => sslcert
+
+        host.stubs(:key).returns key
+        host.stubs(:certificate).returns certificate
+
+        sslcert.expects(:check_private_key).with("private_key").returns true
+
+        host.should be_certificate_matches_key
+    end
+
     describe "when specifying the CA location" do
         before do
             [Puppet::SSL::Key, Puppet::SSL::Certificate, Puppet::SSL::CertificateRequest, Puppet::SSL::CertificateRevocationList].each do |klass|
@@ -359,11 +408,10 @@ describe Puppet::SSL::Host do
     describe "when managing its certificate" do
         before do
             @realcert = mock 'certificate'
-            @realcert.stubs(:check_private_key).with('private key').returns true
-
-            @cert = stub 'cert', :content => @realcert, :expired? => false
+            @cert = stub 'cert', :content => @realcert
 
-            @host.stubs(:key).returns stub("key",:content => 'private key' )
+            @host.stubs(:key).returns mock("key")
+            @host.stubs(:certificate_matches_key?).returns true
         end
 
         it "should find the CA certificate if it does not have a certificate" do
@@ -411,22 +459,12 @@ describe Puppet::SSL::Host do
             @host.certificate.should equal(@cert)
         end
 
-        it "should immediately expire the cached copy if the found certificate does not match the private key" do
-            @realcert.expects(:check_private_key).with('private key').returns false
-
-            Puppet::SSL::Certificate.stubs(:find).returns @cert
-            Puppet::SSL::Certificate.expects(:expire).with("myname")
-
-            @host.certificate
-        end
-
-        it "should not return a certificate if it does not match the private key" do
-            @realcert.expects(:check_private_key).with('private key').returns false
+        it "should fail if the found certificate does not match the private key" do
+            @host.expects(:certificate_matches_key?).returns false
 
             Puppet::SSL::Certificate.stubs(:find).returns @cert
-            Puppet::SSL::Certificate.stubs(:expire).with("myname")
 
-            @host.certificate.should == nil
+            lambda { @host.certificate }.should raise_error(Puppet::Error)
         end
 
         it "should return any previously found certificate" do

data/spec/unit/type/file.rb

@@ -16,6 +16,42 @@ describe Puppet::Type.type(:file) do
         @file.catalog = @catalog
     end
 
+    describe "#write" do
+
+        it "should propagate failures encountered when renaming the temporary file" do
+            File.stubs(:open)
+
+            File.expects(:rename).raises ArgumentError
+            file = Puppet::Type::File.new(:name => "/my/file", :backup => "puppet")
+
+            lambda { file.write("something", :content) }.should raise_error(Puppet::Error)
+        end
+
+        describe "when validating the checksum" do
+            before { @file.stubs(:validate_checksum?).returns(true) }
+
+            it "should fail if the checksum property and content checksums do not match" do
+                property = stub('checksum_property', :checktype => :md5, :md5 => 'checksum_a', :getsum => 'checksum_b')
+                @file.stubs(:property).with(:checksum).returns(property)
+
+                @file.stubs(:validate_checksum?).returns(true)
+                lambda { @file.write "something", :NOTUSED }.should raise_error(Puppet::Error)
+            end
+        end
+
+        describe "when not validating the checksum" do
+            before { @file.stubs(:validate_checksum?).returns(false) }
+
+            it "should not fail if the checksum property and content checksums do not match" do
+                property = stub('checksum_property', :checktype => :md5, :md5 => 'checksum_a', :getsum => 'checksum_b')
+                @file.stubs(:property).with(:checksum).returns(property)
+
+                lambda { @file.write "something", :NOTUSED }.should_not raise_error(Puppet::Error)
+            end
+
+        end
+    end
+
     it "should have a method for determining if the file is present" do
         @file.must respond_to(:exist?)
     end
@@ -320,6 +356,13 @@ describe Puppet::Type.type(:file) do
             @file.expects(:newchild).with("my/file").returns "fiebar"
             @file.recurse_local.should == {"my/file" => "fiebar"}
         end
+
+        it "should set checksum_type to none if this file checksum is none" do
+            @file[:checksum] = :none
+            Puppet::FileServing::Metadata.expects(:search).with { |path,params| params[:checksum_type] == :none }.returns [@metadata]
+            @file.expects(:newchild).with("my/file").returns "fiebar"
+            @file.recurse_local
+        end
     end
 
     it "should have a method for performing link recursion" do
@@ -764,15 +807,4 @@ describe Puppet::Type.type(:file) do
             file.finish
         end
     end
-
-    describe "when writing the file" do
-        it "should propagate failures encountered when renaming the temporary file" do
-            File.stubs(:open)
-
-            File.expects(:rename).raises ArgumentError
-            file = Puppet::Type::File.new(:name => "/my/file", :backup => "puppet")
-
-            lambda { file.write("something", :content) }.should raise_error(Puppet::Error)
-        end
-    end
 end

data/spec/unit/type/file/checksum.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+
+checksum = Puppet::Type.type(:file).attrclass(:checksum)
+describe checksum do
+    before do
+        # Wow that's a messy interface to the resource.
+        @resource = stub 'resource', :[] => nil, :[]= => nil, :property => nil, :newattr => nil, :parameter => nil
+    end
+
+    it "should be a subclass of Property" do
+        checksum.superclass.must == Puppet::Property
+    end
+
+    it "should have default checksum of :md5" do
+        @checksum = checksum.new(:resource => @resource)
+        @checksum.checktype.should == :md5
+    end
+
+    [:none, nil, ""].each do |ck|
+        it "should use a none checksum for #{ck.inspect}" do
+            @checksum = checksum.new(:resource => @resource)
+            @checksum.should = "none"
+            @checksum.checktype.should == :none
+        end
+    end
+end

data/spec/unit/type/tidy.rb

@@ -60,6 +60,28 @@ describe tidy do
                 lambda { @tidy[:recurse] = "whatever" }.should raise_error
             end
         end
+
+        describe "for 'matches'" do
+            before do
+                @tidy = Puppet::Type.type(:tidy).new :path => "/tmp", :age => "100d"
+            end
+
+            it "should object if matches is given with recurse is not specified" do
+                lambda { @tidy[:matches] = '*.doh' }.should raise_error
+            end
+            it "should object if matches is given and recurse is 0" do
+                lambda { @tidy[:recurse] = 0; @tidy[:matches] = '*.doh' }.should raise_error
+            end
+            it "should object if matches is given and recurse is false" do
+                lambda { @tidy[:recurse] = false; @tidy[:matches] = '*.doh' }.should raise_error
+            end
+            it "should not object if matches is given and recurse is > 0" do
+                lambda { @tidy[:recurse] = 1; @tidy[:matches] = '*.doh' }.should_not raise_error
+            end
+            it "should not object if matches is given and recurse is true" do
+                lambda { @tidy[:recurse] = true; @tidy[:matches] = '*.doh' }.should_not raise_error
+            end
+        end
     end
 
     describe "when matching files by age" do
@@ -199,7 +221,7 @@ describe tidy do
 
         describe "and determining whether a file matches provided glob patterns" do
             before do
-                @tidy = Puppet::Type.type(:tidy).new :path => "/what/ever"
+                @tidy = Puppet::Type.type(:tidy).new :path => "/what/ever", :recurse => 1
                 @tidy[:matches] = %w{*foo* *bar*}
 
                 @stat = mock 'stat'
@@ -273,6 +295,12 @@ describe tidy do
 
                 @sizer.must be_tidy("/what/ever", @stat)
             end
+
+            it "should return true if the file is equal to the specified size" do
+                @stat.expects(:size).returns(1024)
+
+                @sizer.must be_tidy("/what/ever", @stat)
+            end
         end
 
         describe "and determining whether a file should be tidied" do
@@ -310,6 +338,7 @@ describe tidy do
             end
 
             it "should return false if it does not match any provided globs" do
+                @tidy[:recurse] = 1
                 @tidy[:matches] = "globs"
 
                 matches = @tidy.parameter(:matches)

data/spec/unit/util/autoload.rb

@@ -51,8 +51,9 @@ describe Puppet::Util::Autoload do
         end
 
         it "should include the module directories, the Puppet libdir, and all of the Ruby load directories" do
+            Puppet.stubs(:[]).with(:libdir).returns(%w{/libdir1 /lib/dir/two /third/lib/dir}.join(File::PATH_SEPARATOR))
             @autoload.expects(:module_directories).returns %w{/one /two}
-            @autoload.search_directories.should == ["/one", "/two", Puppet[:libdir], $:].flatten
+            @autoload.search_directories.should == %w{/one /two /libdir1 /lib/dir/two /third/lib/dir} + $:
         end
 
         it "should include in its search path all of the search directories that have a subdirectory matching the autoload path" do

data/spec/unit/util/checksums.rb

@@ -14,7 +14,7 @@ describe Puppet::Util::Checksums do
     end
 
     content_sums = [:md5, :md5lite, :sha1, :sha1lite]
-    file_only = [:ctime, :mtime]
+    file_only = [:ctime, :mtime, :none]
 
     content_sums.each do |sumtype|
         it "should be able to calculate %s sums from strings" % sumtype do
@@ -104,4 +104,10 @@ describe Puppet::Util::Checksums do
             end
         end
     end
+
+    describe "when using the none checksum" do
+        it "should return an empty string" do
+            @summer.none_file("/my/file").should == ""
+        end
+    end
 end

data/spec/unit/util/settings.rb

@@ -79,6 +79,7 @@ describe Puppet::Util::Settings do
         end
 
         it "should support a getopt-specific mechanism for turning booleans off" do
+            @settings[:bool] = true
             @settings.handlearg("--no-bool", "")
             @settings[:bool].should == false
         end
@@ -97,20 +98,33 @@ describe Puppet::Util::Settings do
             @settings[:bool].should == true
         end
 
-        it "should consider a cli setting with an empty string as an argument to be a boolean" do
+        it "should consider a cli setting with an empty string as an argument to be a boolean, if the setting itself is a boolean" do
             # Turn it off first
             @settings[:bool] = false
             @settings.handlearg("--bool", "")
             @settings[:bool].should == true
         end
 
+        it "should consider a cli setting with an empty string as an argument to be an empty argument, if the setting itself is not a boolean" do
+            @settings[:myval] = "bob"
+            @settings.handlearg("--myval", "")
+            @settings[:myval].should == ""
+        end
+
         it "should consider a cli setting with a boolean as an argument to be a boolean" do
             # Turn it off first
             @settings[:bool] = false
-            @settings.handlearg("--bool", true)
+            @settings.handlearg("--bool", "true")
             @settings[:bool].should == true
         end
 
+       it "should not consider a cli setting of a non boolean with a boolean as an argument to be a boolean" do
+            # Turn it off first
+            @settings[:myval] = "bob"
+            @settings.handlearg("--no-myval", "")
+            @settings[:myval].should == ""
+        end
+
         it "should clear the cache when setting getopt-specific values" do
             @settings.setdefaults :mysection, :one => ["whah", "yay"], :two => ["$one yay", "bah"]
             @settings[:two].should == "whah yay"
@@ -1018,4 +1032,27 @@ describe Puppet::Util::Settings do
 
         it "should cache the result"
     end
+
+    describe "#without_noop" do
+        before do
+            @settings = Puppet::Util::Settings.new
+            @settings.setdefaults :main, :noop => [true, ""]
+        end
+
+        it "should set noop to false for the duration of the block" do
+            @settings.without_noop { @settings.value(:noop, :cli).should be_false }
+        end
+
+        it "should ensure that noop is returned to its previous value" do
+            @settings.without_noop { raise } rescue nil
+            @settings.value(:noop, :cli).should be_true
+        end
+
+        it "should work even if no 'noop' setting is available" do
+            settings = Puppet::Util::Settings.new
+            stuff = nil
+            settings.without_noop { stuff = "yay" }
+            stuff.should == "yay"
+        end
+    end
 end