puppet 0.25.1 → 0.25.2

data/spec/unit/ssl/host.rb

@@ -90,55 +90,6 @@ 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|
@@ -408,10 +359,11 @@ describe Puppet::SSL::Host do
     describe "when managing its certificate" do
         before do
             @realcert = mock 'certificate'
-            @cert = stub 'cert', :content => @realcert
+            @realcert.stubs(:check_private_key).with('private key').returns true
+
+            @cert = stub 'cert', :content => @realcert, :expired? => false
 
-            @host.stubs(:key).returns mock("key")
-            @host.stubs(:certificate_matches_key?).returns true
+            @host.stubs(:key).returns stub("key",:content => 'private key' )
         end
 
         it "should find the CA certificate if it does not have a certificate" do
@@ -459,12 +411,22 @@ describe Puppet::SSL::Host do
             @host.certificate.should equal(@cert)
         end
 
-        it "should fail if the found certificate does not match the private key" do
-            @host.expects(:certificate_matches_key?).returns false
+        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
 
             Puppet::SSL::Certificate.stubs(:find).returns @cert
+            Puppet::SSL::Certificate.stubs(:expire).with("myname")
 
-            lambda { @host.certificate }.should raise_error(Puppet::Error)
+            @host.certificate.should == nil
         end
 
         it "should return any previously found certificate" do
@@ -654,14 +616,14 @@ describe Puppet::SSL::Host do
 
         it "should catch and log errors during CSR saving" do
             @host.expects(:certificate).times(2).returns(nil).then.returns "foo"
-            @host.expects(:generate).times(2).raises(RuntimeError).then.returns nil
+            @host.expects(:generate).raises(RuntimeError).then.returns nil
             @host.stubs(:sleep)
             @host.wait_for_cert(1)
         end
 
         it "should sleep and retry after failures saving the CSR if waitforcert is enabled" do
             @host.expects(:certificate).times(2).returns(nil).then.returns "foo"
-            @host.expects(:generate).times(2).raises(RuntimeError).then.returns nil
+            @host.expects(:generate).raises(RuntimeError).then.returns nil
             @host.expects(:sleep).with(1)
             @host.wait_for_cert(1)
         end

data/spec/unit/transaction.rb

@@ -20,8 +20,8 @@ describe Puppet::Transaction do
 
     describe "when generating resources" do
         it "should finish all resources" do
-            generator = stub 'generator', :depthfirst? => true
-            resource = stub 'resource'
+            generator = stub 'generator', :depthfirst? => true, :tags => []
+            resource = stub 'resource', :tag => nil
 
             @catalog = Puppet::Resource::Catalog.new
             @transaction = Puppet::Transaction.new(@catalog)
@@ -36,8 +36,8 @@ describe Puppet::Transaction do
         end
 
         it "should skip generated resources that conflict with existing resources" do
-            generator = mock 'generator'
-            resource = stub 'resource'
+            generator = mock 'generator', :tags => []
+            resource = stub 'resource', :tag => nil
 
             @catalog = Puppet::Resource::Catalog.new
             @transaction = Puppet::Transaction.new(@catalog)
@@ -51,6 +51,21 @@ describe Puppet::Transaction do
 
             @transaction.generate_additional_resources(generator, :generate).should be_empty
         end
+
+        it "should copy all tags to the newly generated resources" do
+            child = stub 'child'
+            generator = stub 'resource', :tags => ["one", "two"]
+
+            @catalog = Puppet::Resource::Catalog.new
+            @transaction = Puppet::Transaction.new(@catalog)
+
+            generator.stubs(:generate).returns [child]
+            @catalog.stubs(:add_resource)
+
+            child.expects(:tag).with("one", "two")
+
+            @transaction.generate_additional_resources(generator, :generate)
+        end
     end
 
     describe "when skipping a resource" do
@@ -65,6 +80,16 @@ describe Puppet::Transaction do
             @transaction.skip?(@resource).should be_true
         end
 
+        it "should ask the resource if it's tagged with any of the tags" do
+            tags = ['one', 'two']
+            @transaction.stubs(:ignore_tags?).returns(false)
+            @transaction.stubs(:tags).returns(tags)
+
+            @resource.expects(:tagged?).with(*tags).returns(true)
+
+            @transaction.missing_tags?(@resource).should be_false
+        end
+
         it "should skip not scheduled resources" do
             @transaction.stubs(:scheduled?).returns(false)
             @transaction.skip?(@resource).should be_true
@@ -108,4 +133,14 @@ describe Puppet::Transaction, " when determining tags" do
         @transaction.tags = "one::two"
         @transaction.tags.should == %w{one::two}
     end
+
+    it "should accept a comma-delimited string" do
+        @transaction.tags = "one, two"
+        @transaction.tags.should == %w{one two}
+    end
+
+    it "should accept an empty string" do
+        @transaction.tags = ""
+        @transaction.tags.should == []
+    end
 end

data/spec/unit/type.rb

@@ -89,6 +89,15 @@ describe Puppet::Type do
         Puppet::Type.type(:mount).new(:name => "foo").version.should == 0
     end
 
+    it "should provide source_descriptors" do
+        resource = Puppet::Type.type(:mount).new(:name => "foo")
+        catalog = Puppet::Resource::Catalog.new
+        catalog.version = 50
+        catalog.add_resource resource
+
+        resource.source_descriptors.should == {:version=>50, :tags=>["mount", "foo"], :path=>"/Mount[foo]"}
+    end
+
     describe "when choosing a default provider" do
         it "should choose the provider with the highest specificity" do
             # Make a fake type

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

@@ -119,6 +119,15 @@ describe content do
             @content.retrieve.should be_nil
         end
 
+        it "should not manage content on links" do
+            @content = content.new(:resource => @resource)
+
+            stat = mock 'stat', :ftype => "link"
+            @resource.expects(:stat).returns stat
+
+            @content.retrieve.should be_nil
+        end
+
         it "should always return the checksum as a string" do
             @content = content.new(:resource => @resource)
             @content.stubs(:checksum_type).returns "mtime"
@@ -188,6 +197,26 @@ describe content do
                 @content.must be_insync("{md5}" + Digest::MD5.hexdigest("some content"))
             end
 
+            describe "and Puppet[:show_diff] is set" do
+                before do
+                    Puppet[:show_diff] = true
+                end
+
+                it "should display a diff if the current contents are different from the desired content" do 
+                    @content.should = "some content"
+                    @content.expects(:string_file_diff).once
+
+                    @content.insync?("other content")
+                end
+
+                it "should not display a diff if the sum for the current contents is the same as the sum for the desired content" do 
+                    @content.should = "some content"
+                    @content.expects(:string_file_diff).never
+
+                    @content.insync?("{md5}" + Digest::MD5.hexdigest("some content"))
+                end
+            end
+
             describe "and the content is specified via a remote source" do
                 before do
                     @metadata = stub 'metadata'

data/spec/unit/type/maillist.rb

@@ -0,0 +1,42 @@
+#!/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") }
+
+maillist = Puppet::Type.type(:maillist)
+
+describe maillist do
+    before do
+        @provider_class = Puppet::Type.type(:maillist).provider(:mailman)
+
+        @provider = stub 'provider', :class => @provider_class, :clear => nil
+        @provider.stubs(:respond_to).with(:aliases).returns(true)
+
+        @provider_class.stubs(:new).returns(@provider)
+
+        Puppet::Type.type(:maillist).stubs(:defaultprovider).returns(@provider_class)
+        
+        @maillist = Puppet::Type.type(:maillist).new( :name => 'test' )
+
+        @catalog = Puppet::Resource::Catalog.new
+        @maillist.catalog = @catalog
+    end
+
+    it "should generate aliases unless they already exist" do
+        # Mail List aliases are careful not to stomp on managed Mail Alias aliases
+
+        # test1 is an unmanaged alias from /etc/aliases
+        Puppet::Type.type(:mailalias).provider(:aliases).stubs(:target_object).returns( StringIO.new("test1: root\n") )
+
+        # test2 is a managed alias from the manifest
+        dupe = Puppet::Type.type(:mailalias).new( :name => 'test2' )
+        @catalog.add_resource dupe
+
+        @provider.stubs(:aliases).returns({"test1" => 'this will get included', "test2" => 'this will dropped', "test3" => 'this will get included'})
+
+        generated = @maillist.generate
+        generated.map{ |x| x.name  }.sort.should == ['test1', 'test3']
+        generated.map{ |x| x.class }.should      == [Puppet::Type::Mailalias, Puppet::Type::Mailalias]
+
+    end
+
+end

data/spec/unit/type/resources.rb

@@ -8,7 +8,7 @@ resources = Puppet::Type.type(:resources)
 describe resources do
     describe "when initializing" do
         it "should fail if the specified resource type does not exist" do
-            Puppet::Type.stubs(:type).with("Resources").returns resources
+            Puppet::Type.stubs(:type).with { |x| x.to_s.downcase == "resources"}.returns resources
             Puppet::Type.expects(:type).with("nosuchtype").returns nil
             lambda { resources.new :name => "nosuchtype" }.should raise_error(Puppet::Error)
         end
@@ -21,4 +21,69 @@ describe resources do
             resources.new(:name => "file").resource_type.should == Puppet::Type.type(:file)
         end
     end
+
+    describe "#generate" do
+      before do
+          @host1 = Puppet::Type.type(:host).new(:name => 'localhost', :ip => '127.0.0.1')
+          @catalog = Puppet::Resource::Catalog.new
+          @context = Puppet::Transaction.new(@catalog)
+      end
+
+        describe "when dealing with non-purging resources" do
+            before do
+                @resources = Puppet::Type.type(:resources).new(:name => 'host')
+            end
+
+            it "should not generate any resource" do
+                @resources.generate.should be_empty
+            end
+        end
+
+        describe "when the catalog contains a purging resource" do
+            before do
+                @resources = Puppet::Type.type(:resources).new(:name => 'host', :purge => true)
+                @purgeable_resource = Puppet::Type.type(:host).new(:name => 'localhost', :ip => '127.0.0.1')
+                @catalog.add_resource @resources
+            end
+
+            it "should not generate a duplicate of that resource" do
+                Puppet::Type.type(:host).stubs(:instances).returns [@host1]
+                @catalog.add_resource @host1
+                @resources.generate.collect { |r| r.ref }.should_not include(@host1.ref)
+            end
+
+
+            describe "when generating a purgeable resource" do
+                it "should be included in the generated resources" do
+                    Puppet::Type.type(:host).stubs(:instances).returns [@purgeable_resource]
+                    @resources.generate.collect { |r| r.ref }.should include(@purgeable_resource.ref)
+                end
+            end
+
+            describe "when the instance's do not have an ensure property" do
+                it "should not be included in the generated resources" do
+                    @no_ensure_resource = Puppet::Type.type(:exec).new(:name => '/usr/bin/env echo')
+                    Puppet::Type.type(:host).stubs(:instances).returns [@no_ensure_resource]
+                    @resources.generate.collect { |r| r.ref }.should_not include(@no_ensure_resource.ref)
+                end
+            end
+
+            describe "when the instance's ensure property does not accept absent" do
+                it "should not be included in the generated resources" do
+                    @no_absent_resource = Puppet::Type.type(:service).new(:name => 'foobar')
+                    Puppet::Type.type(:host).stubs(:instances).returns [@no_absent_resource]
+                    @resources.generate.collect { |r| r.ref }.should_not include(@no_absent_resource.ref)
+                end
+            end
+
+            describe "when checking the instance fails" do
+                it "should not be included in the generated resources" do
+                    @purgeable_resource = Puppet::Type.type(:host).new(:name => 'foobar')
+                    Puppet::Type.type(:host).stubs(:instances).returns [@purgeable_resource]
+                    @resources.expects(:check).with(@purgeable_resource).returns(false)
+                    @resources.generate.collect { |r| r.ref }.should_not include(@purgeable_resource.ref)
+                end
+            end
+        end
+    end
 end

data/spec/unit/type/tidy.rb

@@ -7,6 +7,10 @@ tidy = Puppet::Type.type(:tidy)
 describe tidy do
     before do
         Puppet.settings.stubs(:use)
+
+        # for an unknown reason some of these specs fails when run individually
+        # with a failed expectation on File.lstat in the autoloader.
+        File.stubs(:lstat)
     end
 
     it "should use :lstat when stating a file" do
@@ -161,7 +165,7 @@ describe tidy do
                 Puppet::FileServing::Fileset.stubs(:new).returns @fileset
             end
 
-            it "should use a Fileset for recursion" do
+            it "should use a Fileset for infinite recursion" do
                 Puppet::FileServing::Fileset.expects(:new).with("/what/ever", :recurse => true).returns @fileset
                 @fileset.expects(:files).returns %w{. one two}
                 @tidy.stubs(:tidy?).returns false
@@ -169,6 +173,15 @@ describe tidy do
                 @tidy.generate
             end
 
+            it "should use a Fileset for limited recursion" do
+                @tidy[:recurse] = 42
+                Puppet::FileServing::Fileset.expects(:new).with("/what/ever", :recurse => true, :recurselimit => 42).returns @fileset
+                @fileset.expects(:files).returns %w{. one two}
+                @tidy.stubs(:tidy?).returns false
+
+                @tidy.generate
+            end
+
             it "should generate a file resource for every file that should be tidied but not for files that should not be tidied" do
                 @fileset.expects(:files).returns %w{. one two}
 

data/spec/unit/util/autoload.rb

@@ -111,6 +111,8 @@ describe Puppet::Util::Autoload do
         before do
             @autoload.stubs(:searchpath).returns %w{/a}
             Dir.stubs(:glob).returns "/path/to/file.rb"
+
+            @autoload.class.stubs(:loaded?).returns(false)
         end
 
         [RuntimeError, LoadError, SyntaxError].each do |error|

data/spec/unit/util/ldap/connection.rb

@@ -8,7 +8,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'puppet/util/ldap/connection'
 
 # So our mocks and such all work, even when ldap isn't available.
-unless defined?(LDAP::Conn)
+unless Puppet.features.ldap?
     class LDAP
         class Conn
             def initialize(*args)

data/spec/unit/util/log.rb

@@ -157,6 +157,20 @@ describe Puppet::Util::Log do
                 end
             end
 
+            it "should use the source_descriptors" do
+                source = stub "source"
+                source.stubs(:source_descriptors).returns(:tags => ["tag","tag2"], :path => "path", :version => 100)
+                
+                log = Puppet::Util::Log.new(:level => "notice", :message => :foo)
+                log.expects(:tag).with("tag")
+                log.expects(:tag).with("tag2")
+                log.expects(:version=).with(100)
+
+                log.source = source
+
+                log.source.should == "path"
+            end
+
             it "should copy over any version information" do
                 catalog = Puppet::Resource::Catalog.new
                 catalog.version = 25

data/spec/unit/util/monkey_patches.rb

@@ -0,0 +1,103 @@
+#!/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") }
+
+require 'puppet/util/monkey_patches'
+
+describe RDoc do
+    it "should return the call stack if a script is called directly" do
+        stack = [
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:99:in `usage_no_exit'",
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:93:in `usage'",
+            "./puppet/application.rb:295:in `help'",
+            "./puppet/application.rb:207:in `handle_help'",
+            "./puppet/application.rb:141:in `send'",
+            "./puppet/application.rb:141:in `option'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `call'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `catch'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1248:in `order!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1339:in `permute!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1360:in `parse!'", 
+            "./puppet/application.rb:262:in `parse_options'", 
+            "./puppet/application.rb:214:in `run'", 
+            "./puppet/application.rb:306:in `exit_on_fail'", 
+            "./puppet/application.rb:214:in `run'", 
+            "../bin/puppet:71"
+        ]
+
+        old_dollar_zero = $0
+        $0 = "../bin/puppet"
+
+        # Mocha explodes if you try to mock :caller directly
+        Kernel.expects( :mock_caller ).returns( stack )
+        Kernel.instance_eval { alias orig_caller caller      }
+        Kernel.instance_eval { alias caller      mock_caller }
+
+        RDoc.caller.must == stack
+
+        $0 = old_dollar_zero
+        Kernel.instance_eval { alias caller      orig_caller }
+    end
+
+    it "should return a truncated call stack if a script is called from a rubygems stub" do
+        gem_stack = [
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:99:in `usage_no_exit'", 
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:93:in `usage'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:295:in `help'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:207:in `handle_help'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:141:in `send'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:141:in `option'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `call'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `catch'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1248:in `order!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1339:in `permute!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1360:in `parse!'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:262:in `parse_options'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:214:in `run'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:306:in `exit_on_fail'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:214:in `run'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/bin/puppet:71", 
+            "/usr/bin/puppet:19:in `load'", 
+            "/usr/bin/puppet:19"
+        ]
+
+        real_stack = [
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:99:in `usage_no_exit'", 
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:93:in `usage'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:295:in `help'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:207:in `handle_help'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:141:in `send'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:141:in `option'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `call'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `catch'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1248:in `order!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1339:in `permute!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1360:in `parse!'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:262:in `parse_options'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:214:in `run'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:306:in `exit_on_fail'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:214:in `run'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/bin/puppet:71", 
+        ]
+
+        old_dollar_zero = $0
+        $0 = '/usr/bin/puppet'
+
+        # Mocha explodes if you try to mock :caller directly
+        Kernel.expects( :mock_caller ).returns( gem_stack )
+        Kernel.instance_eval { alias orig_caller caller      }
+        Kernel.instance_eval { alias caller      mock_caller }
+
+        RDoc.caller.must == real_stack
+
+        $0 = old_dollar_zero
+        Kernel.instance_eval { alias caller      orig_caller }
+    end
+end
+