puppet 0.18.4 → 0.22.4

data/test/network/handler/report.rb

@@ -0,0 +1,185 @@
+#!/usr/bin/env ruby
+
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+
+require 'puppettest'
+require 'puppet/network/handler/report'
+require 'puppettest/reporttesting'
+
+class TestReportServer < Test::Unit::TestCase
+	include PuppetTest
+	include PuppetTest::Reporttesting
+
+    Report = Puppet::Network::Handler.report
+	Puppet::Util.logmethods(self)
+
+    def mkserver
+        server = nil
+        assert_nothing_raised {
+            server = Puppet::Network::Handler.report.new()
+        }
+        server
+    end
+
+    def mkclient(server = nil)
+        server ||= mkserver()
+        client = nil
+        assert_nothing_raised {
+            client = Puppet::Network::Client.report.new(:Report => server)
+        }
+
+        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|
+            name = "processtest%s" % i
+            reports << name
+
+            Report.newreport(name) do
+                def process
+                    $run << self.report_name
+                end
+            end
+        end
+        Puppet[:reports] = reports.collect { |r| r.to_s }.join(",")
+
+        report = fakereport
+
+        retval = nil
+        assert_nothing_raised {
+            retval = server.send(:process, YAML.dump(report))
+        }
+
+        reports.each do |name|
+            assert($run.include?(name.intern), "Did not run %s" % name)
+        end
+
+        # Now make sure our server doesn't die on missing reports
+        Puppet[:reports] = "fakereport"
+        assert_nothing_raised {
+            retval = server.send(:process, YAML.dump(report))
+        }
+    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"
+
+        # Create a server
+        server = Puppet::Network::Handler.report.new
+
+        {"myreport" => ["myreport"],
+            " fake, another, yay " => ["fake", "another", "yay"]
+        }.each do |str, ary|
+            Puppet[:reports] = str
+            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/{server/pelement.rb → network/handler/resource.rb}

@@ -1,18 +1,13 @@
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
+#!/usr/bin/env ruby
+
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server/pelement'
-require 'test/unit'
-require 'puppettest.rb'
+require 'puppettest'
 require 'base64'
 require 'cgi'
 
-class TestPElementServer < Test::Unit::TestCase
-	include ServerTest
+class TestResourceServer < Test::Unit::TestCase
+    include PuppetTest::ServerTest
 
     def verify_described(type, described)
         described.each do |name, trans|
@@ -27,11 +22,8 @@ class TestPElementServer < Test::Unit::TestCase
                 obj.retrieve
             end
 
-            assert(obj.insync?, "Described %s[%s] is not in sync" %
-                [trans.type, name])
-
             if trans.type == :package
-                assert_equal(Puppet::Type.type(:package).default, obj[:type])
+                assert_equal(Puppet::Type.type(:package).defaultprovider.name, obj[:provider])
             end
         end
         type.clear
@@ -45,7 +37,7 @@ class TestPElementServer < Test::Unit::TestCase
         server = nil
 
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Network::Handler.resource.new()
         end
 
         # The first run we create the file on the copy, the second run
@@ -85,12 +77,12 @@ class TestPElementServer < Test::Unit::TestCase
 
                 assert(object, "Could not create type")
 
-                retrieve.each do |state|
-                    assert(object.should(state), "Did not retrieve %s" % state)
+                retrieve.each do |property|
+                    assert(object.should(property), "Did not retrieve %s" % property)
                 end
 
-                ignore.each do |state|
-                    assert(! object.should(state), "Incorrectly retrieved %s" % state)
+                ignore.each do |property|
+                    assert(! object.should(property), "Incorrectly retrieved %s" % property)
                 end
 
                 if i == 0
@@ -125,7 +117,7 @@ class TestPElementServer < Test::Unit::TestCase
         server = nil
 
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Network::Handler.resource.new()
         end
 
         [   [nil],
@@ -160,16 +152,16 @@ class TestPElementServer < Test::Unit::TestCase
 
             assert(object, "Could not create type")
 
-            retrieve.each do |state|
-                assert(object.should(state), "Did not retrieve %s" % state)
+            retrieve.each do |property|
+                assert(object.should(property), "Did not retrieve %s" % property)
             end
 
-            ignore.each do |state|
-                assert(! object.should(state), "Incorrectly retrieved %s" % state)
+            ignore.each do |property|
+                assert(! object.should(property), "Incorrectly retrieved %s" % property)
             end
 
+            #assert_apply(object)
             assert_events([:directory_created], object)
-
             assert(FileTest.directory?(file), "Directory did not get recreated")
             Dir.rmdir(file)
         end
@@ -178,12 +170,12 @@ class TestPElementServer < Test::Unit::TestCase
     def test_describe_alltypes
         # Systems get pretty retarded, so I'm going to set the path to some fake
         # data for ports
-        #Puppet::Type::ParsedType::Port.path = File.join($puppetbase,
+        #Puppet::Type::ParsedType::Port.path = File.join(basedir,
         #    "test/data/types/ports/1")
         #Puppet.err Puppet::Type::ParsedType::Port.path
         server = nil
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Network::Handler.resource.new()
         end
 
         require 'etc'
@@ -245,7 +237,7 @@ class TestPElementServer < Test::Unit::TestCase
     def test_apply
         server = nil
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Network::Handler.resource.new()
         end
 
         file = tempfile()
@@ -260,23 +252,16 @@ class TestPElementServer < Test::Unit::TestCase
 
         Puppet::Type.type(:file).clear
 
-        Puppet.err filetrans[:parent].inspect
-
-        #p filetrans
-
         bucket = Puppet::TransBucket.new
         bucket.type = "file"
         bucket.push filetrans
 
-        #p bucket
-
         oldbucket = bucket.dup
         File.unlink(file)
         assert_nothing_raised {
             server.apply(bucket)
         }
 
-
         assert(FileTest.exists?(file), "File did not get recreated")
 
         # Now try it as a "nonlocal" server
@@ -293,11 +278,13 @@ class TestPElementServer < Test::Unit::TestCase
             Puppet.warning "YAML is broken on this machine"
             return
         end
-        #puts Base64.decode64(yaml)
+        # puts Base64.decode64(yaml)
+        objects = nil
         assert_nothing_raised("Could not reload yaml") {
             YAML::load(Base64.decode64(yaml))
         }
 
+        # The server is supposed to accept yaml and execute it.
         assert_nothing_raised {
             server.apply(yaml)
         }
@@ -305,4 +292,4 @@ class TestPElementServer < Test::Unit::TestCase
     end
 end
 
-# $Id: pelement.rb 1224 2006-05-25 06:24:44Z luke $
+# $Id: resource.rb 2296 2007-03-18 22:48:57Z luke $

data/test/{server → network/handler}/runner.rb

@@ -1,16 +1,11 @@
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
+#!/usr/bin/env ruby
+
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server/runner'
-require 'test/unit'
-require 'puppettest.rb'
+require 'puppettest'
 
-class TestServerRunner < Test::Unit::TestCase
-	include TestPuppet
+class TestHandlerRunner < Test::Unit::TestCase
+	include PuppetTest
 
     def mkclient(file)
         master = nil
@@ -18,7 +13,7 @@ class TestServerRunner < Test::Unit::TestCase
         # create our master
         assert_nothing_raised() {
             # this is the default server setup
-            master = Puppet::Server::Master.new(
+            master = Puppet::Network::Handler.master.new(
                 :Manifest => file,
                 :UseNodes => false,
                 :Local => true
@@ -27,7 +22,7 @@ class TestServerRunner < Test::Unit::TestCase
 
         # and our client
         assert_nothing_raised() {
-            client = Puppet::Client::MasterClient.new(
+            client = Puppet::Network::Client.master.new(
                 :Master => master
             )
         }
@@ -36,14 +31,18 @@ class TestServerRunner < Test::Unit::TestCase
     end
 
     def test_runner
+        FileUtils.mkdir_p(Puppet[:statedir])
         Puppet[:ignoreschedules] = false
         # Okay, make our manifest
         file = tempfile()
         created = tempfile()
+        # We specify the schedule here, because I was having problems with
+        # using default schedules.
         File.open(file, "w") do |f|
             f.puts %{
                 class yayness {
-                    file { "#{created}": ensure => file, schedule => weekly }
+                    schedule { "yayness": period => weekly }
+                    file { "#{created}": ensure => file, schedule => yayness }
                 }
 
                 include yayness
@@ -54,7 +53,7 @@ class TestServerRunner < Test::Unit::TestCase
 
         runner = nil
         assert_nothing_raised {
-            runner = Puppet::Server::Runner.new
+            runner = Puppet::Network::Handler.runner.new
         }
         # First: tags
         # Second: ignore schedules true/false
@@ -75,6 +74,8 @@ class TestServerRunner < Test::Unit::TestCase
                 ["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",
@@ -103,5 +104,5 @@ class TestServerRunner < Test::Unit::TestCase
     end
 end
 
-# $Id: runner.rb 1325 2006-06-28 15:17:56Z luke $
+# $Id: runner.rb 2316 2007-03-19 16:42:41Z luke $
 

data/test/network/rights.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+
+require 'puppettest'
+require 'puppet/network/rights'
+
+class TestRights < Test::Unit::TestCase
+	include PuppetTest
+
+    def setup
+        super
+        @store = Puppet::Network::Rights.new
+    end
+
+
+    def test_rights
+        assert_raise(ArgumentError, "Did not fail on unknown right") {
+            @store.allowed?(:write, "host.madstop.com", "0.0.0.0")
+        }
+
+        assert_nothing_raised {
+            @store.newright(:write)
+        }
+
+        assert(! @store.allowed?(:write, "host.madstop.com", "0.0.0.0"),
+            "Defaulted to allowing access")
+
+        assert_nothing_raised {
+            @store[:write].info "This is a log message"
+        }
+
+        assert_logged(:info, /This is a log message/, "did not log from Rights")
+    end
+end
+
+# $Id: rights.rb 2262 2007-03-08 00:16:53Z luke $
+