puppet 0.23.2 → 0.24.0

data/test/network/handler/report.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/handler/report'
@@ -31,46 +31,13 @@ class TestReportServer < Test::Unit::TestCase
         client
     end
 
-    def test_report_autoloading
-        # Create a fake report
-        fakedir = tempfile()
-        $: << fakedir
-        cleanup do $:.delete(fakedir) end
-
-        libdir = File.join(fakedir, "puppet", "reports")
-        FileUtils.mkdir_p(libdir)
-
-        $myreportrun = false
-        file = File.join(libdir, "myreport.rb")
-        File.open(file, "w") { |f| f.puts %{
-                Puppet::Network::Handler.report.newreport(:myreport) do
-                    def process(report)
-                        $myreportrun = true
-                        return report
-                    end
-                end
-            }
-        }
-        Puppet[:reports] = "myreport"
-
-        # Create a server
-        server = Puppet::Network::Handler.report.new
-
-        report = nil
-        assert_nothing_raised {
-            report = Puppet::Network::Handler.report.report(:myreport)
-        }
-        assert(report, "Did not get report")
-
-    end
-
     def test_process
         server = Puppet::Network::Handler.report.new
 
         # We have to run multiple reports to make sure there's no conflict
         reports = []
         $run = []
-        5.times do |i|
+        2.times do |i|
             name = "processtest%s" % i
             reports << name
 
@@ -100,35 +67,6 @@ class TestReportServer < Test::Unit::TestCase
         }
     end
 
-    # Make sure reports can specify whether to use yaml or not
-    def test_useyaml
-        server = Puppet::Network::Handler.report.new
-
-        Report.newreport(:yamlyes, :useyaml => true) do
-            def process(report)
-                $yamlyes = :yesyaml
-            end
-        end
-
-        Report.newreport(:yamlno) do
-            def process
-                $yamlno = :noyaml
-            end
-        end
-
-        Puppet[:reports] = "yamlyes, yamlno"
-
-        report = fakereport
-        yaml = YAML.dump(report)
-
-        assert_nothing_raised do
-            server.send(:process, yaml)
-        end
-
-        assert_equal(:noyaml, $yamlno, "YAML was used for non-yaml report")
-        assert_equal(:yesyaml, $yamlyes, "YAML was not used for yaml report")
-    end
-
     def test_reports
         Puppet[:reports] = "myreport"
 
@@ -142,44 +80,4 @@ class TestReportServer < Test::Unit::TestCase
             assert_equal(ary, server.send(:reports))
         end
     end
-
-    def test_newreport
-        name = :newreporttest
-        assert_nothing_raised do
-            Report.newreport(name) do
-                attr_accessor :processed
-
-                def process(report)
-                    @processed = report
-                end
-            end
-        end
-
-        assert(Report.report(name), "Did not get report")
-        assert_instance_of(Module, Report.report(name))
-
-        obj = "yay"
-        obj.extend(Report.report(name))
-
-        assert_nothing_raised do
-            obj.process("yay")
-        end
-
-        assert_equal("yay", obj.processed)
-    end
-
-    # Make sure we get a list of all reports
-    def test_report_list
-        list = nil
-        assert_nothing_raised do
-            list = Puppet::Network::Handler.report.reports
-        end
-
-        [:rrdgraph, :store, :tagmail].each do |name|
-            assert(list.include?(name), "Did not load %s" % name)
-        end
-    end
 end
-
-# $Id: report.rb 2259 2007-03-06 19:03:05Z luke $
-

data/test/network/handler/resource.rb

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'base64'
 require 'cgi'
 
 class TestResourceServer < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::ServerTest
 
     def verify_described(type, described)
@@ -236,7 +238,7 @@ class TestResourceServer < Test::Unit::TestCase
     def test_apply
         server = nil
         assert_nothing_raised do
-            server = Puppet::Network::Handler.resource.new()
+            server = Puppet::Network::Handler.resource.new(:Local => false)
         end
 
         file = tempfile()
@@ -253,6 +255,7 @@ class TestResourceServer < Test::Unit::TestCase
 
         bucket = Puppet::TransBucket.new
         bucket.type = "file"
+        bucket.name = "test"
         bucket.push filetrans
 
         oldbucket = bucket.dup
@@ -291,4 +294,3 @@ class TestResourceServer < Test::Unit::TestCase
     end
 end
 
-# $Id: resource.rb 2551 2007-06-04 20:37:14Z luke $

data/test/network/handler/runner.rb

@@ -1,21 +1,20 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 
 class TestHandlerRunner < Test::Unit::TestCase
 	include PuppetTest
 
-    def mkclient(file)
+    def mkclient(code)
         master = nil
         client = nil
+        Puppet[:code] = code
         # create our master
         assert_nothing_raised() {
             # this is the default server setup
             master = Puppet::Network::Handler.master.new(
-                :Manifest => file,
-                :UseNodes => false,
                 :Local => true
             )
         }
@@ -30,7 +29,8 @@ class TestHandlerRunner < Test::Unit::TestCase
         client
     end
 
-    def test_runner
+    def setup
+        super
         FileUtils.mkdir_p(Puppet[:statedir])
         Puppet[:ignoreschedules] = false
         # Okay, make our manifest
@@ -38,8 +38,7 @@ class TestHandlerRunner < Test::Unit::TestCase
         created = tempfile()
         # We specify the schedule here, because I was having problems with
         # using default schedules.
-        File.open(file, "w") do |f|
-            f.puts %{
+        @code = %{
                 class yayness {
                     schedule { "yayness": period => weekly }
                     file { "#{created}": ensure => file, schedule => yayness }
@@ -47,62 +46,25 @@ class TestHandlerRunner < Test::Unit::TestCase
 
                 include yayness
             }
-        end
 
-        client = mkclient(file)
+        @client = mkclient(@code)
 
-        runner = nil
-        assert_nothing_raised {
-            runner = Puppet::Network::Handler.runner.new
-        }
-        # First: tags
-        # Second: ignore schedules true/false
-        # Third: background true/false
-        # Fourth: whether file should exist true/false
-        [
-            ["with no backgrounding",
-                nil, true, true, true],
-            ["in the background",
-                nil, true, false, true],
-            ["with a bad tag",
-                ["coolness"], true, false, false],
-            ["with another bad tag",
-                "coolness", true, false, false],
-            ["with a good tag",
-                ["coolness", "yayness"], true, false, true],
-            ["with another good tag",
-                ["yayness"], true, false, true],
-            ["with a third good tag",
-                "yayness", true, false, true],
-            ["with no tags",
-                "", true, false, true],
-            ["not ignoring schedules",
-                nil, false, false, false],
-            ["ignoring schedules",
-                nil, true, false, true],
-        ].each do |msg, tags, ignore, fg, shouldexist|
-            if FileTest.exists?(created)
-                File.unlink(created)
-            end
-            assert_nothing_raised {
-                # Try it without backgrounding
-                runner.run(tags, ignore, fg)
-            }
+        @runner = Puppet::Network::Handler.runner.new
+    end
+
+    def test_runner_when_in_foreground
+        @client.expects(:run).with(:tags => "mytags", :ignoreschedules => true)
+
+        Process.expects(:newthread).never
 
-            unless fg
-                Puppet.join
-            end
-
-            if shouldexist
-                assert(FileTest.exists?(created), "File did not get created " +
-                    msg)
-            else
-                assert(!FileTest.exists?(created), "File got created incorrectly " +
-                    msg)
-            end
-        end
+        @runner.run("mytags", true, true)
     end
-end
 
-# $Id: runner.rb 2316 2007-03-19 16:42:41Z luke $
+    def test_runner_when_in_background
+        @client.expects(:run).with(:tags => "mytags", :ignoreschedules => true)
+
+        Puppet.expects(:newthread).yields
 
+        @runner.run("mytags", true, false)
+    end
+end

data/test/network/rights.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/rights'
@@ -34,5 +34,4 @@ class TestRights < Test::Unit::TestCase
     end
 end
 
-# $Id: rights.rb 2262 2007-03-08 00:16:53Z luke $
 

data/test/network/server/mongrel_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
@@ -12,7 +12,7 @@ class TestMongrelServer < PuppetTest::TestCase
 
     def mkserver(handlers = nil)
         handlers ||= { :Status => nil }
-        mongrel = Puppet::Network::Server::Mongrel.new(handlers)
+        mongrel = Puppet::Network::HTTPServer::Mongrel.new(handlers)
     end
 
     # Make sure client info is correctly extracted.
@@ -89,4 +89,3 @@ class TestMongrelServer < PuppetTest::TestCase
     end
 end
 
-# $Id: mongrel_test.rb 2752 2007-08-06 20:05:28Z luke $

data/test/network/server/webrick.rb

@@ -1,19 +1,25 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
-require 'puppet/network/server/webrick'
+require 'puppet/network/http_server/webrick'
+require 'mocha'
 
 class TestWebrickServer < Test::Unit::TestCase
     include PuppetTest::ServerTest
 
+    def setup
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
+        super
+    end
+
     # Make sure we can create a server, and that it knows how to create its
     # certs by default.
     def test_basics
         server = nil
         assert_raise(Puppet::Error, "server succeeded with no cert") do
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @@port,
                 :Handlers => {
                     :Status => nil
@@ -22,7 +28,7 @@ class TestWebrickServer < Test::Unit::TestCase
         end
 
         assert_nothing_raised("Could not create simple server") do
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @@port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
@@ -80,10 +86,11 @@ class TestWebrickServer < Test::Unit::TestCase
         kill_and_wait(serverpid, server.pidfile)
         serverpid, server = mk_status_server
 
-        client = mk_status_client
-        # This time the client should be denied
-        assert_raise(Puppet::Network::XMLRPCClientError) {
-            client.status
+        # This time the client should be denied.  With keep-alive,
+        # the client starts its connection immediately, thus throwing
+        # the error.
+        assert_raise(OpenSSL::SSL::SSLError) {
+            client = Puppet::Network::Client.status.new(:Server => "localhost", :Port => @@port)
         }
     end
     
@@ -95,7 +102,7 @@ class TestWebrickServer < Test::Unit::TestCase
 
         assert_nothing_raised() {
             client = Puppet::Network::Client.status.new(
-                :Server => "localhost",
+                :Server => Facter.value(:fqdn),
                 :Port => @@port
             )
         }
@@ -105,7 +112,7 @@ class TestWebrickServer < Test::Unit::TestCase
     def mk_status_server
         server = nil
         assert_nothing_raised() {
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @@port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
@@ -137,4 +144,3 @@ class TestWebrickServer < Test::Unit::TestCase
     end
 end
 
-# $Id: webrick.rb 2558 2007-06-11 18:07:34Z luke $

data/test/network/xmlrpc/client.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/xmlrpc/client'
@@ -8,6 +8,12 @@ require 'mocha'
 
 class TestXMLRPCClient < Test::Unit::TestCase
     include PuppetTest
+
+    def setup
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
+        super
+    end
+
     def test_set_backtrace
         error = Puppet::Network::XMLRPCClientError.new("An error")
         assert_nothing_raised do
@@ -45,25 +51,34 @@ class TestXMLRPCClient < Test::Unit::TestCase
             client = Puppet::Network::XMLRPCClient.new()
         end
 
-        ca = Puppet::Network::Handler.ca.new
-        caclient = Puppet::Network::Client.ca.new :CA => ca
-        caclient.request_cert
+        caclient = mock 'client', :cert => :ccert, :key => :ckey
+
+        FileTest.expects(:exist?).with(Puppet[:localcacert]).returns(true)
+
+        store = mock 'sslstore'
+        OpenSSL::X509::Store.expects(:new).returns(store)
+        store.expects(:add_file).with(Puppet[:localcacert])
+        store.expects(:purpose=).with(OpenSSL::X509::PURPOSE_SSL_CLIENT)
 
         class << client
             attr_accessor :http
         end
 
-        client.http.expects(:ca_file=).with(Puppet[:localcacert])
-        client.http.expects(:cert=).with(caclient.cert)
-        client.http.expects(:key=).with(caclient.key)
-        client.http.expects(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
-        client.http.expects(:cert_store=)
+        http = mock 'http'
+        client.http = http
+
+        http.expects(:ca_file).returns(false)
+        http.expects(:ca_file=).with(Puppet[:localcacert])
+        http.expects(:cert=).with(:ccert)
+        http.expects(:key=).with(:ckey)
+        http.expects(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
+        http.expects(:cert_store=)
 
         assert_nothing_raised do
             client.cert_setup(caclient)
         end
     end
-end
-
-# $Id: client.rb 2624 2007-06-19 01:49:19Z luke $
 
+    def test_http_cache
+    end
+end