puppet 0.22.4 → 0.23.0

data/test/lib/puppettest.rb

@@ -118,6 +118,19 @@ module PuppetTest
         $0 =~ /test_loader/
     end
 
+    # Redirect stdout and stderr
+    def redirect
+        @stderr = tempfile
+        @stdout = tempfile
+        $stderr = File.open(@stderr, "w")
+        $stdout = File.open(@stdout, "w")
+
+        cleanup do
+            $stderr = STDERR
+            $stdout = STDOUT
+        end
+    end
+
     def setup
         @memoryatstart = Puppet::Util.memory
         if defined? @@testcount

data/test/lib/puppettest/exetest.rb

@@ -13,10 +13,17 @@ module PuppetTest::ExeTest
         File.join(basedir, "bin")
     end
 
+    def sbindir
+        File.join(basedir, "sbin")
+    end
+
     def setbindir
         unless ENV["PATH"].split(":").include?(bindir)
             ENV["PATH"] = [bindir, ENV["PATH"]].join(":")
         end
+        unless ENV["PATH"].split(":").include?(sbindir)
+            ENV["PATH"] = [sbindir, ENV["PATH"]].join(":")
+        end
     end
 
     def setlibdir

data/test/lib/puppettest/fakes.rb

@@ -5,12 +5,12 @@ module PuppetTest
     class FakeModel
         include Puppet::Util
         class << self
-            attr_accessor :name, :realmodel
-            @name = :fakemodel
+            attr_accessor :name, :realresource
+            @name = :fakeresource
         end
 
         def self.namevar
-            @realmodel.namevar
+            @realresource.namevar
         end
 
         def self.validproperties
@@ -26,7 +26,7 @@ module PuppetTest
         end
 
         def [](param)
-            if @realmodel.attrtype(param) == :property
+            if @realresource.attrtype(param) == :property
                 @is[param]
             else
                 @params[param]
@@ -35,11 +35,11 @@ module PuppetTest
 
         def []=(param, value)
             param = symbolize(param)
-            unless @realmodel.validattr?(param)
+            unless @realresource.validattr?(param)
                 raise Puppet::DevError, "Invalid attribute %s for %s" %
-                    [param, @realmodel.name]
+                    [param, @realresource.name]
             end
-            if @realmodel.attrtype(param) == :property
+            if @realresource.attrtype(param) == :property
                 @should[param] = value
             else
                 @params[param] = value
@@ -47,12 +47,12 @@ module PuppetTest
         end
 
         def initialize(name)
-            @realmodel = Puppet::Type.type(self.class.name)
-            raise "Could not find type #{self.class.name}" unless @realmodel
+            @realresource = Puppet::Type.type(self.class.name)
+            raise "Could not find type #{self.class.name}" unless @realresource
             @is = {}
             @should = {}
             @params = {}
-            self[@realmodel.namevar] = name
+            self[@realresource.namevar] = name
         end
 
         def inspect
@@ -83,9 +83,9 @@ module PuppetTest
     end
 
     class FakeProvider
-        attr_accessor :model
+        attr_accessor :resource
         class << self
-            attr_accessor :name, :model, :methods
+            attr_accessor :name, :resource_type, :methods
         end
 
         # A very low number, so these never show up as defaults via the standard
@@ -96,7 +96,7 @@ module PuppetTest
 
         # Set up methods to fake things
         def self.apimethods(*ary)
-            @model.validproperties.each do |property|
+            @resource_type.validproperties.each do |property|
                 ary << property unless ary.include? property
             end
             attr_accessor(*ary)
@@ -114,6 +114,10 @@ module PuppetTest
             end
         end
 
+        def self.source
+            self.name
+        end
+
         def self.supports_parameter?(param)
             true
         end
@@ -123,11 +127,18 @@ module PuppetTest
         end
 
         def clear
-            @model = nil
+            @resource = nil
         end
 
-        def initialize(model)
-            @model = model
+        def initialize(resource)
+            @resource = resource
+        end
+
+        def properties
+            self.class.resource_type.validproperties.inject({}) do |props, name|
+                props[name] = self.send(name) || :absent
+                props
+            end
         end
     end
 
@@ -154,30 +165,30 @@ module PuppetTest
         end
     end
 
-    @@fakemodels = {}
+    @@fakeresources = {}
     @@fakeproviders = {}
 
-    def fakemodel(type, name, options = {})
+    def fakeresource(type, name, options = {})
         type = type.intern if type.is_a? String
-        unless @@fakemodels.include? type
-            @@fakemodels[type] = Class.new(FakeModel)
-            @@fakemodels[type].name = type
+        unless @@fakeresources.include? type
+            @@fakeresources[type] = Class.new(FakeModel)
+            @@fakeresources[type].name = type
 
-            model = Puppet::Type.type(type)
-            raise("Could not find type %s" % type) unless model
-            @@fakemodels[type].realmodel = model
+            resource = Puppet::Type.type(type)
+            raise("Could not find type %s" % type) unless resource
+            @@fakeresources[type].realresource = resource
         end
 
-        obj = @@fakemodels[type].new(name)
+        obj = @@fakeresources[type].new(name)
         options.each do |name, val|
             obj[name] = val
         end
         obj
     end
 
-    module_function :fakemodel
+    module_function :fakeresource
 
-    def fakeprovider(type, model)
+    def fakeprovider(type, resource)
         type = type.intern if type.is_a? String
         unless @@fakeproviders.include? type
             @@fakeproviders[type] = Class.new(FakeModel) do
@@ -185,7 +196,7 @@ module PuppetTest
             end
         end
 
-        @@fakeproviders[type].new(model)
+        @@fakeproviders[type].new(resource)
     end
 
     module_function :fakeprovider

data/test/lib/puppettest/railstesting.rb

@@ -53,4 +53,4 @@ module PuppetTest::RailsTesting
     end
 end
 
-# $Id: railstesting.rb 1979 2006-12-28 08:06:46Z luke $
+# $Id: railstesting.rb 2567 2007-06-12 00:38:03Z ballman $

data/test/lib/puppettest/support/assertions.rb

@@ -34,8 +34,8 @@ module PuppetTest
         FileUtils.rm(filename)
     end
 
-    def assert_rollback_events(events, trans, msg = nil)
-        run_events(:rollback, events, trans, msg)
+    def assert_rollback_events(trans, events, msg = nil)
+        run_events(:rollback, trans, events, msg)
     end
 
     def assert_events(events, *items)

data/test/lib/puppettest/support/collection.rb

@@ -0,0 +1,30 @@
+
+module PuppetTest::Support::Collection
+    def run_collection_queries(form)
+        {true => [%{title == "/tmp/testing"}, %{(title == "/tmp/testing")},
+            %{title == "/tmp/testing" and group == bin}, %{title == bin or group == bin},
+            %{title == "/tmp/testing" or title == bin}, %{title == "/tmp/testing"},
+            %{(title == "/tmp/testing" or title == bin) and group == bin}],
+        false => [%{title == bin}, %{title == bin or (title == bin and group == bin)},
+            %{title != "/tmp/testing"}, %{title != "/tmp/testing" and group != bin}]
+        }.each do |res, ary|
+            ary.each do |str|
+                if form == :virtual
+                    code = "File <| #{str} |>"
+                else
+                    code = "File <<| #{str} |>>"
+                end
+                parser = mkparser
+                query = nil
+
+                assert_nothing_raised("Could not parse '#{str}'") do
+                    query = parser.parse(code)[0].query
+                end
+
+                yield str, res, query
+            end
+        end
+    end
+end
+
+# $Id: collection.rb 2597 2007-06-17 21:41:50Z luke $

data/test/network/client/ca.rb

@@ -2,6 +2,7 @@
 
 $:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
+require 'mocha'
 require 'puppettest'
 require 'puppet/network/client/ca'
 require 'puppet/sslcertificates/support'
@@ -33,6 +34,31 @@ class TestClientCA < Test::Unit::TestCase
             client = Puppet::Network::Client.ca.new
         end
     end
+
+    # #578
+    def test_invalid_certs_are_not_written
+        # Run the get once, which should be valid
+
+        assert_nothing_raised("Could not get a certificate") do
+            @client.request_cert
+        end
+
+        # Now remove the cert and keys, so we get a broken cert
+        File.unlink(Puppet[:hostcert])
+        File.unlink(Puppet[:localcacert])
+        File.unlink(Puppet[:hostprivkey])
+
+        @client = Puppet::Network::Client.ca.new :CA => @ca
+        @ca.expects(:getcert).returns("yay") # not a valid cert
+        # Now make sure it fails, since we'll get the old cert but have new keys
+        assert_raise(Puppet::Network::Client::CA::InvalidCertificate, "Did not fail on invalid cert") do
+            @client.request_cert
+        end
+
+        # And then make sure the cert isn't written to disk
+        assert(! FileTest.exists?(Puppet[:hostcert]),
+            "Invalid cert got written to disk")
+    end
 end
 
-# $Id: ca.rb 2263 2007-03-08 00:21:38Z luke $
+# $Id: ca.rb 2612 2007-06-18 19:51:17Z luke $

data/test/network/client/client.rb

@@ -115,7 +115,7 @@ class TestClient < Test::Unit::TestCase
         Puppet[:ssldir] = confdir
         Puppet.config.mkdir(:ssldir)
         Puppet.config.clearused
-        Puppet.config.use(:certificates, :ca)
+        Puppet.config.use(:ssl, :ca)
 
         mkserver
 
@@ -216,7 +216,7 @@ class TestClient < Test::Unit::TestCase
 
     # Make sure we get a client class for each handler type.
     def test_loading_all_clients
-        %w{ca dipper file logger master report resource runner status}.each do |name|
+        %w{ca dipper file master report resource runner status}.each do |name|
             client = nil
             assert_nothing_raised do
                 client = Puppet::Network::Client.client(name)
@@ -256,4 +256,4 @@ class TestClient < Test::Unit::TestCase
     end
 end
 
-# $Id: client.rb 2375 2007-03-30 23:17:40Z luke $
+# $Id: client.rb 2497 2007-05-09 16:21:56Z luke $

data/test/network/client/master.rb

@@ -3,6 +3,7 @@
 $:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
+require 'mocha'
 
 class TestMasterClient < Test::Unit::TestCase
     include PuppetTest::ServerTest
@@ -622,6 +623,106 @@ end
         assert(! master.send(:lockfile).locked?,
             "Master is still locked after failure")
     end
+
+    # Make sure we get a value for timeout
+    def test_config_timeout
+        master = Puppet::Network::Client.client(:master)
+        time = Integer(Puppet[:configtimeout])
+        assert_equal(time, master.timeout, "Did not get default value for timeout")
+        assert_equal(time, master.timeout, "Did not get default value for timeout on second run")
+
+        # Reset it
+        Puppet[:configtimeout] = "50"
+        assert_equal(50, master.timeout, "Did not get changed default value for timeout")
+        assert_equal(50, master.timeout, "Did not get changed default value for timeout on second run")
+
+        # Now try an integer
+        Puppet[:configtimeout] = 100
+        assert_equal(100, master.timeout, "Did not get changed integer default value for timeout")
+        assert_equal(100, master.timeout, "Did not get changed integer default value for timeout on second run")
+    end
+
+    # #569 -- Make sure we can ignore dynamic facts.
+    def test_dynamic_facts
+        client = mkclient 
+
+        assert_equal(%w{memorysize memoryfree swapsize swapfree}, client.class.dynamic_facts,
+            "Did not get correct defaults for dynamic facts")
+
+        # Cache some values for comparison
+        cached = {"one" => "yep", "two" => "nope"}
+        Puppet::Util::Storage.cache(:configuration)[:facts] = cached
+
+        assert(! client.send(:facts_changed?, cached), "Facts incorrectly considered to be changed")
+
+        # Now add some values to the passed result and make sure we get a positive
+        newfacts = cached.dup
+        newfacts["changed"] = "something"
+
+        assert(client.send(:facts_changed?, newfacts), "Did not catch changed fact")
+
+        # Now add a dynamic fact and make sure it's ignored
+        newfacts = cached.dup
+        newfacts["memorysize"] = "something"
+
+        assert(! client.send(:facts_changed?, newfacts), "Dynamic facts resulted in a false positive")
+
+        # And try it with both
+        cached["memorysize"] = "something else"
+        assert(! client.send(:facts_changed?, newfacts), "Dynamic facts resulted in a false positive")
+
+        # And finally, with only in the cache
+        newfacts.delete("memorysize")
+        assert(! client.send(:facts_changed?, newfacts), "Dynamic facts resulted in a false positive")
+    end
+
+    def test_splay
+        client = mkclient
+
+        # Make sure we default to no splay
+        client.expects(:sleep).never
+
+        assert_nothing_raised("Failed to call splay") do
+            client.send(:splay)
+        end
+
+        # Now set it to true and make sure we get the right value
+        client = mkclient
+        client.expects(:sleep)
+
+        Puppet[:splay] = true
+        assert_nothing_raised("Failed to call sleep when splay is true") do
+            client.send(:splay)
+        end
+
+        time = Puppet::Util::Storage.cache(:configuration)[:splay_time]
+        assert(time, "Splay time was not cached")
+
+        # Now try it again
+        client = mkclient
+        client.expects(:sleep).with(time)
+
+        assert_nothing_raised("Failed to call sleep when splay is true with a cached value") do
+            client.send(:splay)
+        end
+    end
+
+    # This is partially to fix #532, but also to save on memory.
+    def test_remove_objects_after_every_run
+        client = mkclient
+
+        ftype = Puppet::Type.type(:file)
+
+        assert_nil(ftype[@createdfile], "file object already exists")
+        assert(! FileTest.exists?(@createdfile), "File already exists on disk")
+
+        assert_nothing_raised("Could not apply config") do
+            client.run
+        end
+
+        assert(FileTest.exists?(@createdfile), "File does not exist on disk")
+        assert_nil(ftype[@createdfile], "file object was not removed from memory")
+    end
 end
 
-# $Id: master.rb 2326 2007-03-19 19:39:26Z luke $
+# $Id: master.rb 2545 2007-05-31 22:47:01Z luke $

data/test/network/handler/ca.rb

@@ -229,6 +229,40 @@ class TestCA < Test::Unit::TestCase
         # And try a different host
         assert(! caserv.autosign?("other.yay.com"), "Host was autosigned")
     end
+
+    # Make sure that a CSR created with keys that don't match the existing
+    # cert throws an exception on the server.
+    def test_mismatched_public_keys_throws_exception
+        ca = Puppet::Network::Handler.ca.new()
+
+        # First initialize the server
+        client = Puppet::Network::Client.ca.new :CA => ca
+        client.request_cert
+        File.unlink(Puppet[:hostcsr])
+
+        # Now use a different cert name
+        Puppet[:certname] = "my.host.com"
+        client = Puppet::Network::Client.ca.new :CA => ca
+        firstcsr = client.csr
+        File.unlink(Puppet[:hostcsr]) if FileTest.exists?(Puppet[:hostcsr])
+
+        assert_nothing_raised("Could not get cert") do
+            ca.getcert(firstcsr.to_s)
+        end
+
+        # Now get rid of the public key, forcing a new csr
+        File.unlink(Puppet[:hostprivkey])
+
+        client = Puppet::Network::Client.ca.new :CA => ca
+
+        second_csr = client.csr
+
+        assert(firstcsr.to_s != second_csr.to_s, "CSR did not change")
+
+        assert_raise(Puppet::Error, "CA allowed mismatched keys") do
+            ca.getcert(second_csr.to_s)
+        end
+    end
 end
 
-# $Id: ca.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: ca.rb 2612 2007-06-18 19:51:17Z luke $