puppet 0.23.2 → 0.24.0

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

@@ -1,6 +1,8 @@
 require 'puppettest'
 
-module PuppetTest
+module PuppetTest::Support
+end
+module PuppetTest::Support::Utils
     def gcdebug(type)
         Puppet.warning "%s: %s" % [type, ObjectSpace.each_object(type) { |o| }]
     end
@@ -19,6 +21,25 @@ module PuppetTest
         }
     end
 
+    # Turn a list of resources, or possibly a catalog and some resources,
+    # into a catalog object.
+    def resources2catalog(*resources)
+        if resources[0].is_a?(Puppet::Node::Catalog)
+            config = resources.shift
+            unless resources.empty?
+                resources.each { |r| config.add_resource r }
+            end
+        elsif resources[0].is_a?(Puppet.type(:component))
+            raise ArgumentError, "resource2config() no longer accpts components"
+            comp = resources.shift
+            comp.delve
+        else
+            config = Puppet::Node::Catalog.new
+            resources.each { |res| config.add_resource res }
+        end
+        return config
+    end
+
     # stop any services that might be hanging around
     def stopservices
         if stype = Puppet::Type.type(:service)
@@ -31,6 +52,7 @@ module PuppetTest
 
     # TODO: rewrite this to use the 'etc' module.
 
+    # Define a variable that contains the name of my user.
     def setme
         # retrieve the user name
         id = %x{id}.chomp
@@ -44,6 +66,16 @@ module PuppetTest
         end
     end
 
+    # Define a variable that contains a group I'm in.
+    def set_mygroup
+        # retrieve the user name
+        group = %x{groups}.chomp.split(/ /)[0]
+	unless group
+	    raise "Could not find group to set in @mygroup"
+	end
+	@mygroup = group
+    end
+
     def run_events(type, trans, events, msg)
         case type
         when :evaluate, :rollback: # things are hunky-dory
@@ -82,7 +114,7 @@ module PuppetTest
     end
 
     def fakefile(name)
-        ary = [basedir, "test"]
+        ary = [PuppetTest.basedir, "test"]
         ary += name.split("/")
         file = File.join(ary)
         unless FileTest.exists?(file)
@@ -127,34 +159,20 @@ module PuppetTest
         }
     end
 
-    def newcomp(*ary)
-        name = nil
-        if ary[0].is_a?(String)
-            name = ary.shift
+    def mk_catalog(*resources)
+        if resources[0].is_a?(String)
+            name = resources.shift
         else
-            name = ary[0].title
+            name = :testing
         end
-
-        comp = Puppet.type(:component).create(:name => name)
-        ary.each { |item|
-            comp.push item
-        }
-
-        return comp
-    end
-    
-    def setme
-        # retrieve the user name
-        id = %x{id}.chomp 
-        if id =~ /uid=\d+\(([^\)]+)\)/
-            @me = $1
-        else
-            puts id
-        end 
-        unless defined? @me
-            raise "Could not retrieve user name; 'id' did not work"
+        config = Puppet::Node::Catalog.new :testing do |conf|
+            resources.each { |resource| conf.add_resource resource }
         end
+
+        return config
     end
 end
 
-# $Id$
+module PuppetTest
+    include PuppetTest::Support::Utils
+end

data/test/lib/puppettest/testcase.rb

@@ -4,28 +4,11 @@
 #  Copyright (c) 2007. All rights reserved.
 
 require 'puppettest'
+require 'puppettest/runnable_test'
 
 class PuppetTest::TestCase < Test::Unit::TestCase
 	include PuppetTest
-    def self.confine(hash)
-        @confines ||= {}
-        hash.each do |message, result|
-            @confines[message] = result
-        end
-    end
-
-    def self.runnable?
-        @messages ||= []
-        return false unless @messages.empty?
-        return true unless defined? @confines
-        @confines.find_all do |message, result|
-            ! result
-        end.each do |message, result|
-            @messages << message
-        end
-
-        return @messages.empty?
-    end
+    extend PuppetTest::RunnableTest
 
     def self.suite
         # Always skip this parent class.  It'd be nice if there were a
@@ -44,5 +27,3 @@ class PuppetTest::TestCase < Test::Unit::TestCase
         end
     end
 end
-
-# $Id: testcase.rb 2267 2007-03-08 06:03:36Z luke $

data/test/lib/rake/puppet_test_loader.rb

@@ -14,4 +14,3 @@ unless runner.run
     exit 14
 end
 
-# $Id: puppet_test_loader.rb 2377 2007-03-31 06:35:23Z luke $

data/test/lib/rake/puppet_testtask.rb

@@ -14,4 +14,3 @@ module Rake
     end
 end
 
-# $Id: puppet_testtask.rb 2057 2007-01-05 21:55:18Z luke $

data/test/network/authconfig.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 
@@ -68,5 +68,4 @@ class TestAuthConfig < Test::Unit::TestCase
     end
 end
 
-# $Id: authconfig.rb 2259 2007-03-06 19:03:05Z luke $
 

data/test/network/authorization.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/authorization'
@@ -134,5 +134,4 @@ class TestAuthConfig < Test::Unit::TestCase
     end
 end
 
-# $Id: authorization.rb 2259 2007-03-06 19:03:05Z luke $
 

data/test/network/authstore.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
@@ -446,5 +446,4 @@ class TestAuthStoreDeclaration < PuppetTest::TestCase
     end
 end
 
-# $Id: authstore.rb 2262 2007-03-08 00:16:53Z luke $
 

data/test/network/client/ca.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'mocha'
 require 'puppettest'
@@ -11,6 +11,7 @@ class TestClientCA < Test::Unit::TestCase
     include PuppetTest::ServerTest
 
     def setup
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
         super
         @ca = Puppet::Network::Handler.ca.new
         @client = Puppet::Network::Client.ca.new :CA => @ca
@@ -22,17 +23,22 @@ class TestClientCA < Test::Unit::TestCase
         end
 
         [:hostprivkey, :hostcert, :localcacert].each do |name|
-            assert(FileTest.exists?(Puppet.config[name]),
+            assert(FileTest.exists?(Puppet.settings[name]),
                 "Did not create cert %s" % name)
         end
     end
 
     # Make sure the ca defaults to specific ports and names
     def test_ca_server
-        client = nil
-        assert_nothing_raised do
-            client = Puppet::Network::Client.ca.new
-        end
+        Puppet.settings.expects(:value).with(:ca_server).returns("myca")
+        Puppet.settings.expects(:value).with(:ca_port).returns(321)
+        Puppet.settings.stubs(:value).with(:http_proxy_host).returns(nil)
+        Puppet.settings.stubs(:value).with(:http_proxy_port).returns(nil)
+        Puppet.settings.stubs(:value).with(:http_keepalive).returns(false)
+
+        # Just throw an error; the important thing is the values, not what happens next.
+        Net::HTTP.stubs(:new).with("myca", 321, nil, nil).raises(ArgumentError)
+        assert_raise(ArgumentError) { Puppet::Network::Client.ca.new }
     end
 
     # #578
@@ -61,4 +67,3 @@ class TestClientCA < Test::Unit::TestCase
     end
 end
 
-# $Id: ca.rb 2612 2007-06-18 19:51:17Z luke $

data/test/network/client/client.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
@@ -46,13 +46,13 @@ class TestClient < Test::Unit::TestCase
         assert(File.exists?(certfile))
         assert(File.exists?(publickeyfile))
 
-        # verify we can retrieve the configuration
-        assert_nothing_raised("Client could not retrieve configuration") {
+        # verify we can retrieve the catalog
+        assert_nothing_raised("Client could not retrieve catalog") {
             client.getconfig
         }
 
         # and apply it
-        assert_nothing_raised("Client could not apply configuration") {
+        assert_nothing_raised("Client could not apply catalog") {
             client.apply
         }
 
@@ -113,9 +113,9 @@ class TestClient < Test::Unit::TestCase
         # Create a new ssl root.
         confdir = tempfile()
         Puppet[:ssldir] = confdir
-        Puppet.config.mkdir(:ssldir)
-        Puppet.config.clearused
-        Puppet.config.use(:ssl, :ca)
+        Puppet.settings.mkdir(:ssldir)
+        Puppet.settings.clearused
+        Puppet.settings.use(:ssl, :ca)
 
         mkserver
 
@@ -141,17 +141,13 @@ class TestClient < Test::Unit::TestCase
     end
 
     def test_classfile
-        manifest = tempfile()
+        Puppet[:code] = "class yaytest {}\n class bootest {}\n include yaytest, bootest"
 
-        File.open(manifest, "w") do |file|
-            file.puts "class yaytest {}\n class bootest {}\n include yaytest, bootest"
-        end
+        Puppet::Node::Facts.indirection.stubs(:save)
 
         master = client = nil
         assert_nothing_raised() {
             master = Puppet::Network::Handler.master.new(
-                :Manifest => manifest,
-                :UseNodes => false,
                 :Local => false
             )
         }
@@ -164,15 +160,13 @@ class TestClient < Test::Unit::TestCase
         # Fake that it's local, so it creates the class file
         client.local = false
 
+        # We can't guarantee class ordering
+        client.expects(:setclasses).with do |array|
+            array.length == 2 and array.include?("yaytest") and array.include?("bootest")
+        end
         assert_nothing_raised {
             client.getconfig
         }
-
-        assert(FileTest.exists?(Puppet[:classfile]), "Class file does not exist")
-
-        classes = File.read(Puppet[:classfile]).split("\n")
-
-        assert_equal(%w{bootest yaytest}, classes.sort)
     end
 
     def test_client_loading
@@ -230,6 +224,8 @@ class TestClient < Test::Unit::TestCase
 
     # Make sure that reading the cert in also sets up the cert stuff for the driver
     def test_read_cert
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
+
         ca = Puppet::Network::Handler.ca.new
         caclient = Puppet::Network::Client.ca.new :CA => ca
 
@@ -247,8 +243,8 @@ class TestClient < Test::Unit::TestCase
         client = FakeClient.new :Test => FakeDriver.new
 
         driver = client.driver
-        driver.meta_def(:cert_setup) { |c| }
-        driver.expects(:cert_setup).with(client)
+        driver.meta_def(:recycle_connection) { |c| }
+        driver.expects(:recycle_connection).with(client)
 
         assert_nothing_raised("Could not read cert") do
             client.read_cert
@@ -256,4 +252,3 @@ class TestClient < Test::Unit::TestCase
     end
 end
 
-# $Id: client.rb 2497 2007-05-09 16:21:56Z luke $

data/test/network/client/dipper.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/client/resource'
@@ -32,4 +32,3 @@ class TestDipperClient < Test::Unit::TestCase
     end
 end
 
-# $Id: dipper.rb 2348 2007-03-24 21:16:20Z luke $

data/test/network/client/master.rb

@@ -1,213 +1,65 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
 
 class TestMasterClient < Test::Unit::TestCase
     include PuppetTest::ServerTest
-    
-    class FakeTrans
-        def initialize
-            @counters = Hash.new { |h,k| h[k] = 0 }
-        end
-        [:evaluate, :report, :cleanup, :addtimes, :tags, :ignoreschedules].each do |m|
-            define_method(m.to_s + "=") do |*args|
-                @counters[m] += 1
-            end
-            define_method(m) do |*args|
-                @counters[m] += 1
-            end
-            define_method(m.to_s + "?") do
-                @counters[m]
-            end
-        end
-    end
-    class FakeComponent
-        attr_accessor :trans
-        def evaluate
-            @trans = FakeTrans.new
-            @trans
-        end
-        
-        def finalize
-            @finalized = true
-        end
-        
-        def finalized?
-            @finalized
-        end
-    end
 
     def setup
         super
         @master = Puppet::Network::Client.master
     end
 
-    def mkmaster(file = nil)
-        master = nil
-
-        file ||= mktestmanifest()
+    def mkmaster(options = {})
+        options[:UseNodes] = false
+        options[:Local] = true
+        if code = options[:Code]
+            Puppet[:code] = code
+        else
+            Puppet[:manifest] = options[:Manifest] || mktestmanifest
+        end
         # create our master
-        assert_nothing_raised() {
-            # this is the default server setup
-            master = Puppet::Network::Handler.master.new(
-                :Manifest => file,
-                :UseNodes => false,
-                :Local => true
-            )
-        }
+        # this is the default server setup
+        master = Puppet::Network::Handler.master.new(options)
         return master
     end
 
     def mkclient(master = nil)
         master ||= mkmaster()
-        client = nil
-        assert_nothing_raised() {
-            client = Puppet::Network::Client.master.new(
-                :Master => master
-            )
-        }
+        client = Puppet::Network::Client.master.new(
+            :Master => master
+        )
 
         return client
     end
-    
-    def mk_fake_client
-        server = Puppet::Network::Handler.master.new :Code => ""
-        master = Puppet::Network::Client.master.new :Server => server, :Local => true
-
-        # Now create some objects
-        objects = FakeComponent.new
-
-        master.send(:instance_variable_set, "@objects", objects)
-
-        class << master
-            def report(r)
-                @reported ||= 0
-                @reported += 1
-            end
-            def reported
-                @reported ||= 0
-                @reported
-            end
-        end
-        return master, objects
-    end
-    
-    def test_apply
-        master, objects = mk_fake_client
-        
-        check = Proc.new do |hash|
-            assert(objects.trans, "transaction was not created")
-            trans = objects.trans
-            hash[:yes].each do |m|
-                assert_equal(1, trans.send(m.to_s + "?"), "did not call #{m} enough times")
-            end
-            hash[:no].each do |m|
-                assert_equal(0, trans.send(m.to_s + "?"), "called #{m} too many times")
-            end
-        end
-        
-        # First try it with no arguments
-        assert_nothing_raised do
-            master.apply
-        end
-        check.call :yes => %w{evaluate cleanup addtimes}, :no => %w{report tags ignoreschedules}
-        assert_equal(0, master.reported, "master sent report with reports disabled")
-        
-        
-        # Now enable reporting and make sure the report method gets called
-        Puppet[:report] = true
-        assert_nothing_raised do
-            master.apply
-        end
-        check.call :yes => %w{evaluate cleanup addtimes}, :no => %w{tags ignoreschedules}
-        assert_equal(1, master.reported, "master did not send report")
-        
-        # Now try it with tags enabled
-        assert_nothing_raised do
-            master.apply("tags")
-        end
-        check.call :yes => %w{evaluate cleanup tags addtimes}, :no => %w{ignoreschedules}
-        assert_equal(2, master.reported, "master did not send report")
-        
-        # and ignoreschedules
-        assert_nothing_raised do
-            master.apply("tags", true)
-        end
-        check.call :yes => %w{evaluate cleanup tags ignoreschedules addtimes}, :no => %w{}
-        assert_equal(3, master.reported, "master did not send report")
-    end
-    
-    def test_getconfig
-        client = mkclient
-        
-        $methodsrun = []
-        cleanup { $methodsrun = nil }
-        client.meta_def(:getplugins) do
-            $methodsrun << :getplugins
-        end
-        client.meta_def(:get_actual_config) do
-            $methodsrun << :get_actual_config
-            result = Puppet::TransBucket.new()
-            result.type = "testing"
-            result.name = "yayness"
-            result
-        end
-        
-        assert_nothing_raised do
-            client.getconfig
-        end
-        [:get_actual_config].each do |method|
-            assert($methodsrun.include?(method), "method %s was not run" % method)
-        end
-        assert(! $methodsrun.include?(:getplugins), "plugins were synced even tho disabled")
-
-        # Now set pluginsync
-        Puppet[:pluginsync] = true
-        $methodsrun.clear
-        
-        assert_nothing_raised do
-            client.getconfig
-        end
-        [:getplugins, :get_actual_config].each do |method|
-            assert($methodsrun.include?(method), "method %s was not run" % method)
-        end
-        
-        objects = client.objects
-        assert(objects.finalized?, "objects were not finalized")
-    end
 
     def test_disable
         FileUtils.mkdir_p(Puppet[:statedir])
         manifest = mktestmanifest
 
-        master = mkmaster(manifest)
+        master = mkmaster(:Manifest => manifest)
 
         client = mkclient(master)
 
-        assert(! FileTest.exists?(@createdfile))
-
-        assert_nothing_raised {
+        assert_nothing_raised("Could not disable client") {
             client.disable
         }
 
-        assert_nothing_raised {
-            client.run
-        }
+        client.expects(:getconfig).never
 
-        assert(! FileTest.exists?(@createdfile), "Disabled client ran")
+        client.run
 
-        assert_nothing_raised {
-            client.enable
-        }
+        client = mkclient(master)
 
-        assert_nothing_raised {
-            client.run
-        }
+        client.expects(:getconfig)
 
-        assert(FileTest.exists?(@createdfile), "Enabled client did not run")
+        assert_nothing_raised("Could not enable client") {
+            client.enable
+        }
+        client.run
     end
 
     # Make sure we're getting the client version in our list of facts
@@ -240,7 +92,7 @@ class TestMasterClient < Test::Unit::TestCase
         }
     end
     
-    # This method is supposed
+    # This method downloads files, and yields each file object if a block is given.
     def test_download
         source = tempfile()
         dest = tempfile()
@@ -327,6 +179,7 @@ end
 
         assert_equal(hostname, Facter.value(:hostname),
             "Lost value to hostname")
+
         assert_equal("yayness", Facter.value(:myfact),
             "Did not get correct fact value")
 
@@ -432,7 +285,7 @@ end
             facts = Puppet::Network::Client.master.facts
         end
         Facter.to_hash.each do |fact, value|
-            assert_equal(facts[fact.downcase], value, "%s is not equal" % fact.inspect)
+            assert_equal(facts[fact.downcase], value.to_s, "%s is not equal" % fact.inspect)
         end
         
         # Make sure the puppet version got added
@@ -448,7 +301,9 @@ end
         manifest = tempfile()
         File.open(manifest, "w") { |f| f.puts "file { '#{file}': content => yay }" }
         
-        driver = mkmaster(manifest)
+        Puppet::Node::Facts.indirection.stubs(:save)
+        
+        driver = mkmaster(:Manifest => manifest)
         driver.local = false
         master = mkclient(driver)
         
@@ -457,7 +312,7 @@ end
         
         assert(! master.fresh?(master.class.facts),
             "Considered fresh with no compile at all")
-        
+
         assert_nothing_raised { master.run }
         assert(master.fresh?(master.class.facts),
             "not considered fresh after compile")
@@ -532,7 +387,9 @@ end
         master.local = false
         driver = master.send(:instance_variable_get, "@driver")
         driver.local = false
+        Puppet::Node::Facts.indirection.stubs(:save)
         # Retrieve the configuration
+
         master.getconfig
 
         # Now the config is up to date, so get rid of the @objects var and
@@ -560,6 +417,8 @@ end
         driver = master.send(:instance_variable_get, "@driver")
         driver.local = false
 
+        Puppet::Node::Facts.indirection.stubs(:save)
+
         assert_nothing_raised("Could not compile config") do
             master.getconfig
         end
@@ -682,20 +541,32 @@ end
         end
     end
 
+    def test_environment_is_added_to_facts
+        facts = Puppet::Network::Client::Master.facts
+        assert_equal(facts["environment"], Puppet[:environment], "Did not add environment to client facts")
+
+        # Now set it to a real value
+        Puppet[:environments] = "something,else"
+        Puppet[:environment] = "something"
+        facts = Puppet::Network::Client::Master.facts
+        assert_equal(facts["environment"], Puppet[:environment], "Did not add environment to client facts")
+    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)
+        file = ftype.create :title => "/what/ever", :ensure => :present
+        config = Puppet::Node::Catalog.new
+        config.add_resource(file)
 
-        assert_nil(ftype[@createdfile], "file object already exists")
-        assert(! FileTest.exists?(@createdfile), "File already exists on disk")
+        config.expects :apply
 
-        assert_nothing_raised("Could not apply config") do
-            client.run
-        end
+        client.catalog = config
+        client.expects(:getconfig)
+        client.run
 
-        assert(FileTest.exists?(@createdfile), "File does not exist on disk")
         assert_nil(ftype[@createdfile], "file object was not removed from memory")
     end
 
@@ -709,6 +580,21 @@ end
             client.run
         end
     end
-end
 
-# $Id: master.rb 2669 2007-07-10 04:17:07Z luke $
+    def test_invalid_catalogs_do_not_get_cached
+        master = mkmaster :Code => "notify { one: require => File[yaytest] }"
+        master.local = false # so it gets cached
+        client = mkclient(master)
+        client.stubs(:facts).returns({})
+        client.local = false
+
+        Puppet::Node::Facts.indirection.stubs(:terminus_class).returns(:memory)
+
+        # Make sure the config is not cached.
+        client.expects(:cache).never
+
+        client.getconfig
+        # Doesn't throw an exception, but definitely fails.
+        client.run
+    end
+end