puppet 0.22.4 → 0.23.0

data/test/network/handler/facts.rb

@@ -0,0 +1,112 @@
+#!/usr/bin/env ruby
+
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+
+require 'puppettest'
+require 'mocha'
+require 'puppet/network/handler/facts'
+
+class TestFactsHandler < Test::Unit::TestCase
+    include PuppetTest::ServerTest
+
+    def setup
+        super
+
+        @class = Puppet::Network::Handler.handler(:facts)
+
+        @@client_facts = {}
+
+        unless Puppet::Util::FactStore.store(:testing)
+            Puppet::Util::FactStore.newstore(:testing) do
+                def get(node)
+                    @@client_facts[node]
+                end
+
+                def set(node, facts)
+                    @@client_facts[node] = facts
+                end
+            end
+        end
+
+        Puppet[:factstore] = :testing
+
+        @handler = @class.new
+
+        @facts = {:a => :b, :c => :d}
+        @name = "foo"
+
+        @backend = @handler.instance_variable_get("@backend")
+    end
+
+    def teardown
+        @@client_facts.clear
+    end
+
+    def test_strip_internal
+        @facts[:_puppet_one] = "yay"
+        @facts[:_puppet_two] = "boo"
+        @facts[:_puppetthree] = "foo"
+
+        newfacts = nil
+        assert_nothing_raised("Could not call strip_internal") do
+            newfacts = @handler.send(:strip_internal, @facts)
+        end
+
+        [:_puppet_one, :_puppet_two, :_puppetthree].each do |name|
+            assert(@facts.include?(name), "%s was removed in strip_internal from original hash" % name)
+        end
+        [:_puppet_one, :_puppet_two].each do |name|
+            assert(! newfacts.include?(name), "%s was not removed in strip_internal" % name)
+        end
+        assert_equal("foo", newfacts[:_puppetthree], "_puppetthree was removed in strip_internal")
+    end
+
+    def test_add_internal
+        newfacts = nil
+        assert_nothing_raised("Could not call strip_internal") do
+            newfacts = @handler.send(:add_internal, @facts)
+        end
+
+        assert_instance_of(Time, newfacts[:_puppet_timestamp], "Did not set timestamp in add_internal")
+        assert(! @facts.include?(:_puppet_timestamp), "Modified original hash in add_internal")
+    end
+
+    def test_set
+        newfacts = @facts.dup
+        newfacts[:_puppet_timestamp] = Time.now
+        @handler.expects(:add_internal).with(@facts).returns(newfacts)
+        @backend.expects(:set).with(@name, newfacts).returns(nil)
+
+        assert_nothing_raised("Could not set facts") do
+            assert_nil(@handler.set(@name, @facts), "handler.set did not return nil")
+        end
+    end
+
+    def test_get
+        prefacts = @facts.dup
+        prefacts[:_puppet_timestamp] = Time.now
+        @@client_facts[@name] = prefacts
+        @handler.expects(:strip_internal).with(prefacts).returns(@facts)
+        @backend.expects(:get).with(@name).returns(prefacts)
+
+        assert_nothing_raised("Could not retrieve facts") do
+            assert_equal(@facts,  @handler.get(@name), "did not get correct answer from handler.get")
+        end
+
+        @handler = @class.new
+        assert_nothing_raised("Failed to call 'get' with no stored facts") do
+            @handler.get("nosuchname")
+        end
+    end
+
+    def test_store_date
+        time = Time.now
+        @facts[:_puppet_timestamp] = time
+
+        @handler.expects(:get).with(@name).returns(@facts)
+
+        assert_equal(time.to_i, @handler.store_date(@name), "Did not retrieve timestamp correctly")
+    end
+end
+
+# $Id: facts.rb 2457 2007-05-03 05:24:13Z luke $

data/test/network/handler/fileserver.rb

@@ -702,6 +702,8 @@ class TestFileServer < Test::Unit::TestCase
     end
 
     def test_servinglinks
+        # Disable the checking, so changes propagate immediately.
+        Puppet[:filetimeout] = -5
         server = nil
         source = tempfile()
         file = File.join(source, "file")
@@ -1124,7 +1126,29 @@ allow *
                         'allow.example.com', "192.168.0.1")
         }
     end
+
+    # Make sure we successfully throw errors -- someone ran into this with
+    # 0.22.4.
+    def test_failures
+        # create a server with the file
+        server = nil
+
+        config = tempfile
+        [
+        "[this is invalid]\nallow one.two.com", # invalid name
+        "[valid]\nallow *.testing something.com", # invalid allow
+        "[valid]\nallow one.two.com\ndeny *.testing something.com", # invalid deny
+        ].each do |failer|
+            File.open(config, "w") { |f| f.puts failer }
+            assert_raise(Puppet::Network::Handler::FileServerError, "Did not fail on %s" % failer.inspect) {
+                server = Puppet::Network::Handler::FileServer.new(
+                    :Local => false,
+                    :Config => config
+                )
+            }
+        end
+    end
 end
 
-# $Id: fileserver.rb 2443 2007-04-30 21:08:06Z luke $
+# $Id: fileserver.rb 2629 2007-06-19 22:18:55Z luke $
 

data/test/network/handler/handler.rb

@@ -48,7 +48,7 @@ class TestHandler < Test::Unit::TestCase
     end
 
     def test_handlers_by_name
-        %w{ca filebucket fileserver logger master report resource runner status}.each do |name|
+        %w{ca filebucket fileserver master report resource runner status}.each do |name|
             handler = nil
             assert_nothing_raised do
                 handler = Puppet::Network::Handler.handler(name)
@@ -61,4 +61,4 @@ class TestHandler < Test::Unit::TestCase
     end
 end
 
-# $Id: handler.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: handler.rb 2497 2007-05-09 16:21:56Z luke $

data/test/network/handler/master.rb

@@ -7,10 +7,6 @@ require 'puppet/network/handler/master'
 
 class TestMaster < Test::Unit::TestCase
     include PuppetTest::ServerTest
-    def teardown
-        super
-        #print "\n\n\n\n" if Puppet[:debug]
-    end
 
     # run through all of the existing test files and make sure everything
     # works
@@ -124,7 +120,7 @@ class TestMaster < Test::Unit::TestCase
         assert(! client.fresh?(facts),
             "Client is incorrectly up to date")
 
-        Puppet.config.use(:puppet)
+        Puppet.config.use(:main)
         assert_nothing_raised {
             client.getconfig
             client.apply
@@ -303,50 +299,7 @@ class TestMaster < Test::Unit::TestCase
         assert_equal(fakename, name)
         assert_equal(fakeip, ip)
     end
-
-    if Puppet.features.rails?
-    def test_freshness_connect_update
-        Puppet::Rails.init
-        Puppet[:storeconfigs] = true
-
-        # this is the default server setup
-        master = Puppet::Network::Handler.master.new(
-            :Code => "",
-            :UseNodes => true,
-            :Local => true
-        )
-
-        # Create a host
-        Puppet::Rails::Host.new(:name => "test", :ip => "192.168.0.3").save
-
-        assert_nothing_raised("Failed to update last_connect for unknown host") do
-            master.freshness("created",'192.168.0.1')
-        end
-        
-        # Make sure it created the host
-        created = Puppet::Rails::Host.find_by_name("created")
-        assert(created, "Freshness did not create host")
-        assert(created.last_freshcheck,
-            "Did not set last_freshcheck on created host")
-        assert_equal("192.168.0.1", created.ip,
-            "Did not set IP address on created host")
-
-        # Now check on the existing host
-        assert_nothing_raised("Failed to update last_connect for unknown host") do
-            master.freshness("test",'192.168.0.2')
-        end
-
-        # Recreate it, so we're not using the cached object.
-        host = Puppet::Rails::Host.find_by_name("test")
-        
-        # Make sure it created the host
-        assert(host.last_freshcheck,
-            "Did not set last_freshcheck on existing host")
-        assert_equal("192.168.0.3", host.ip,
-            "Overrode IP on found host")
-    end
-    end
 end
 
-# $Id: master.rb 2316 2007-03-19 16:42:41Z luke $
+# $Id: master.rb 2616 2007-06-18 21:03:18Z luke $
 

data/test/network/handler/resource.rb

@@ -89,9 +89,8 @@ class TestResourceServer < Test::Unit::TestCase
                     assert_events([:file_created], object)
                 else
                     assert_nothing_raised {
-                        object.retrieve
+                        assert(object.insync?(object.retrieve), "Object was not in sync")
                     }
-                    assert(object.insync?, "Object was not in sync")
                 end
 
                 assert(FileTest.exists?(file), "File did not get recreated")
@@ -184,8 +183,8 @@ class TestResourceServer < Test::Unit::TestCase
         Puppet::Type.type(:schedule).mkdefaultschedules
 
         Puppet::Type.eachtype do |type|
-            unless type.respond_to? :list
-                Puppet.warning "%s does not respond to :list" % type.name
+            unless type.respond_to? :instances
+                Puppet.warning "%s does not respond to :instances" % type.name
                 next
             end
             next unless type.name == :package
@@ -213,7 +212,7 @@ class TestResourceServer < Test::Unit::TestCase
             count = 0
             described = {}
             Puppet.info "listing again"
-            type.list.each do |obj|
+            type.instances.each do |obj|
                 assert_instance_of(type, obj)
 
                 break if count > 5
@@ -292,4 +291,4 @@ class TestResourceServer < Test::Unit::TestCase
     end
 end
 
-# $Id: resource.rb 2296 2007-03-18 22:48:57Z luke $
+# $Id: resource.rb 2551 2007-06-04 20:37:14Z luke $

data/test/network/server/mongrel_test.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+
+require 'puppettest'
+
+class TestMongrelServer < PuppetTest::TestCase
+    confine "Missing mongrel" => Puppet.features.mongrel?
+
+    include PuppetTest::ServerTest
+
+    def mkserver(handlers = nil)
+        handlers ||= { :Status => nil }
+        mongrel = Puppet::Network::Server::Mongrel.new(handlers)
+    end
+
+    # Make sure client info is correctly extracted.
+    def test_client_info
+        obj = Object.new
+        obj.metaclass.send(:attr_accessor, :params)
+        params = {}
+        obj.params = params
+
+        mongrel = mkserver
+
+        ip = Facter.value(:ipaddress)
+        params["REMOTE_ADDR"] = ip
+        params[Puppet[:ssl_client_header]] = "/CN=host.domain.com"
+
+        info = nil
+        assert_nothing_raised("Could not call client_info") do
+            info = mongrel.send(:client_info, obj)
+        end
+
+        assert(info.authenticated?, "Client info object was not marked valid even though the header was present")
+        assert_equal(ip, info.ip, "Did not copy over ip correctly")
+        assert_equal("host.domain.com", info.name, "Did not copy over hostname correctly")
+
+        # Now try it with a different header name
+        params.delete(Puppet[:ssl_client_header])
+        Puppet[:ssl_client_header] = "header_testing"
+        params["header_testing"] = "/CN=other.domain.com"
+        info = nil
+        assert_nothing_raised("Could not call client_info with other header") do
+            info = mongrel.send(:client_info, obj)
+        end
+
+        assert(info.authenticated?, "Client info object was not marked valid even though the header was present")
+        assert_equal(ip, info.ip, "Did not copy over ip correctly")
+        assert_equal("other.domain.com", info.name, "Did not copy over hostname correctly")
+
+        # Now make sure it's considered invalid without that header
+        params.delete("header_testing")
+        info = nil
+        assert_nothing_raised("Could not call client_info with no header") do
+            info = mongrel.send(:client_info, obj)
+        end
+
+        assert(! info.authenticated?, "Client info object was marked valid without header")
+        assert_equal(ip, info.ip, "Did not copy over ip correctly")
+        assert_equal(Resolv.getname(ip), info.name, "Did not look up hostname correctly")
+    end
+end
+
+# $Id: mongrel_test.rb 2570 2007-06-13 16:14:52Z luke $

data/test/network/server/webrick.rb

@@ -5,7 +5,7 @@ $:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 require 'puppettest'
 require 'puppet/network/server/webrick'
 
-class TestServer < Test::Unit::TestCase
+class TestWebrickServer < Test::Unit::TestCase
     include PuppetTest::ServerTest
 
     # Make sure we can create a server, and that it knows how to create its
@@ -137,4 +137,4 @@ class TestServer < Test::Unit::TestCase
     end
 end
 
-# $Id: webrick.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: webrick.rb 2558 2007-06-11 18:07:34Z luke $

data/test/network/xmlrpc/client.rb

@@ -7,6 +7,7 @@ require 'puppet/network/xmlrpc/client'
 require 'mocha'
 
 class TestXMLRPCClient < Test::Unit::TestCase
+    include PuppetTest
     def test_set_backtrace
         error = Puppet::Network::XMLRPCClientError.new("An error")
         assert_nothing_raised do
@@ -64,5 +65,5 @@ class TestXMLRPCClient < Test::Unit::TestCase
     end
 end
 
-# $Id: client.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: client.rb 2624 2007-06-19 01:49:19Z luke $
 

data/test/network/xmlrpc/processor.rb

@@ -7,6 +7,7 @@ require 'puppet/network/xmlrpc/processor'
 require 'mocha'
 
 class TestXMLRPCProcessor < Test::Unit::TestCase
+    include PuppetTest
     class BaseProcessor
         def add_handler(interface, handler)
             @handlers ||= {}
@@ -76,5 +77,5 @@ class TestXMLRPCProcessor < Test::Unit::TestCase
     end
 end
 
-# $Id: processor.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: processor.rb 2624 2007-06-19 01:49:19Z luke $
 

data/test/other/pgraph.rb

@@ -189,10 +189,11 @@ class TestPGraph < Test::Unit::TestCase
             graph.edge_label(:a, :b), "lost label")
     end
 
-    def test_check_cycle
+    def test_fail_on_cycle
         {
-            {:a => :b, :b => :a} => true,
+            {:a => :b, :b => :a, :c => :a, :d => :c} => true, # larger tree involving a smaller cycle
             {:a => :b, :b => :c, :c => :a} => true,
+            {:a => :b, :b => :a, :c => :d, :d => :c} => true,
             {:a => :b, :b => :c} => false,
         }.each do |hash, result|
             graph = Puppet::PGraph.new
@@ -202,11 +203,11 @@ class TestPGraph < Test::Unit::TestCase
 
             if result
                 assert_raise(Puppet::Error, "%s did not fail" % hash.inspect) do
-                    graph.check_cycle(graph.topsort)
+                   graph.topsort
                 end
             else
                 assert_nothing_raised("%s failed" % hash.inspect) do
-                    graph.check_cycle(graph.topsort)
+                    graph.topsort
                 end
             end
         end
@@ -286,4 +287,4 @@ class TestPGraph < Test::Unit::TestCase
     end
 end
 
-# $Id: pgraph.rb 2230 2007-02-27 20:34:32Z luke $
+# $Id: pgraph.rb 2521 2007-05-17 20:57:24Z luke $

data/test/other/propertychange.rb

@@ -10,13 +10,13 @@ require 'puppettest'
 class TestPropertyChange < Test::Unit::TestCase
 	include PuppetTest
 	class FakeProperty < Puppet::Type::Property
-	    attr_accessor :is, :should, :parent
+	    attr_accessor :is, :should, :resource
 	    attr_reader :noop
-	    def change_to_s
+	    def change_to_s(currentvalue, newvalue)
 	        "fake change"
         end
-	    def insync?
-	        @is == @should
+	    def insync?(is)
+	        is == @should
         end
         def log(msg)
             Puppet::Util::Log.create(
@@ -35,11 +35,11 @@ class TestPropertyChange < Test::Unit::TestCase
         def path
             "fakechange"
         end
-        def should_to_s
-            @should.to_s
+        def should_to_s(newvalue)
+            newvalue.to_s
         end
         def sync
-            if insync?
+            if insync?(@is)
                 return nil
             else
                 @is = @should
@@ -52,13 +52,13 @@ class TestPropertyChange < Test::Unit::TestCase
     end
     
     def mkchange
-        property = FakeProperty.new :parent => "fakeparent"
+        property = FakeProperty.new :resource => "fakeparent"
         property.is = :start
         property.should = :finish
-        property.parent = :parent
+        property.resource = :parent
         change = nil
         assert_nothing_raised do
-            change = Puppet::PropertyChange.new(property)
+            change = Puppet::PropertyChange.new(property, :start)
         end
         change.transaction = :trans
         
@@ -125,7 +125,6 @@ class TestPropertyChange < Test::Unit::TestCase
         Puppet[:noop] = true
 
         change.property.noop = true
-        p change.property.noop
         assert(change.noop, "did not set noop")
         assert(change.skip?, "setting noop did not mark change for skipping")
 
@@ -139,4 +138,4 @@ class TestPropertyChange < Test::Unit::TestCase
     end
 end
 
-# $Id: propertychange.rb 2286 2007-03-17 23:16:37Z luke $
+# $Id: propertychange.rb 2517 2007-05-15 19:22:36Z luke $