puppet 0.23.2 → 0.24.0

data/test/network/xmlrpc/processor.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/processor'
@@ -26,6 +26,7 @@ class TestXMLRPCProcessor < Test::Unit::TestCase
 
     def setup
         super
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
         @processor = Processor.new
     end
 
@@ -63,8 +64,7 @@ class TestXMLRPCProcessor < Test::Unit::TestCase
         request.expects(:handler=).with("myhandler")
         request.expects(:method=).with("mymethod")
 
-        # I can't get this expectation to take with the argument, for some reason.
-        @processor.expects(:verify)
+        @processor.stubs(:verify)
         @processor.expects(:handle).with(request.call,
             "params", request.name, request.ip)
 
@@ -77,5 +77,4 @@ class TestXMLRPCProcessor < Test::Unit::TestCase
     end
 end
 
-# $Id: processor.rb 2624 2007-06-19 01:49:19Z luke $
 

data/test/network/xmlrpc/server.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/server'
@@ -24,5 +24,4 @@ class TestXMLRPCServer < Test::Unit::TestCase
     end
 end
 
-# $Id: server.rb 2259 2007-03-06 19:03:05Z luke $
 

data/test/network/xmlrpc/webrick_servlet.rb

@@ -1,13 +1,20 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'puppet/network/xmlrpc/webrick_servlet'
 require 'mocha'
 
 class TestXMLRPCWEBrickServlet < Test::Unit::TestCase
+    include PuppetTest
     def test_basics
+	# Make sure we're doing things as our user info, rather than puppet/puppet
+	setme
+	set_mygroup
+	Puppet[:user] = @me
+	Puppet[:group] = @mygroup
         servlet = nil
         ca = Puppet::Network::Handler.ca.new
 
@@ -22,5 +29,4 @@ class TestXMLRPCWEBrickServlet < Test::Unit::TestCase
     end
 end
 
-# $Id: webrick_servlet.rb 2259 2007-03-06 19:03:05Z luke $
 

data/test/other/dsl.rb

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/dsl'
-require 'puppet/util/autoload'
 require 'puppettest'
 
 class TestDSL < Test::Unit::TestCase
@@ -12,6 +11,7 @@ class TestDSL < Test::Unit::TestCase
 	include Puppet::DSL
 
     def teardown
+        super
         Puppet::Aspect.clear
     end
 
@@ -214,5 +214,3 @@ class TestDSL < Test::Unit::TestCase
         assert_instance_of(Puppet::Parser::Resource, file)
     end
 end
-
-# $Id: dsl.rb 2178 2007-02-07 23:56:59Z luke $

data/test/other/events.rb

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppettest'
 
-# $Id: events.rb 1918 2006-12-13 17:59:21Z luke $
 
 class TestEvents < Test::Unit::TestCase
 	include PuppetTest
@@ -23,7 +22,7 @@ class TestEvents < Test::Unit::TestCase
             :subscribe => [[file.class.name, file.name]] 
         )
 
-        comp = newcomp("eventtesting", file, exec)
+        comp = mk_catalog("eventtesting", file, exec)
 
         trans = assert_events([:file_created, :triggered], comp)
 
@@ -44,56 +43,16 @@ class TestEvents < Test::Unit::TestCase
         )
 
 
-        comp = Puppet.type(:component).create(
-            :name => "eventtesting"
-        )
-        comp.push exec
-        trans = comp.evaluate
-        events = nil
-        assert_nothing_raised {
-            events = trans.evaluate
-        }
+        config = mk_catalog
+        config.add_resource file
+        config.add_resource exec
+        trans = config.apply
 
-        assert_equal(1, events.length)
+        assert_equal(1, trans.events.length)
 
         assert_equal(0, trans.triggered?(exec, :refresh))
     end
 
-    # Verify that one component can subscribe to another component and the "right"
-    # thing happens
-    def test_ladderrequire
-        comps = {}
-        objects = {}
-        fname = tempfile()
-        file = Puppet.type(:file).create(
-            :name => tempfile(),
-            :ensure => "file"
-        )
-
-        exec = Puppet.type(:exec).create(
-            :name => "touch %s" % fname,
-            :path => "/usr/bin:/bin",
-            :refreshonly => true
-        )
-
-        fcomp = newcomp(file)
-        ecomp = newcomp(exec)
-        comp = newcomp("laddercomp", fcomp, ecomp)
-
-        ecomp[:subscribe] = [[fcomp.class.name, fcomp.name]]
-
-        comp.finalize
-
-        trans = comp.evaluate
-        events = nil
-        assert_nothing_raised {
-            events = trans.evaluate
-        }
-
-        assert(FileTest.exists?(fname), "#{fname} does not exist")
-        #assert_equal(events.length, trans.triggered?(objects[:b], :refresh))
-    end
-
     def test_multiplerefreshes
         files = []
 
@@ -115,7 +74,7 @@ class TestEvents < Test::Unit::TestCase
             ["file", f.name]
         }
 
-        comp = newcomp(exec, *files)
+        comp = mk_catalog(exec, *files)
 
         assert_apply(comp)
         assert(FileTest.exists?(fname), "Exec file did not get created")
@@ -147,17 +106,16 @@ class TestEvents < Test::Unit::TestCase
         )
         execs = [exec1, exec2, exec3]
 
-        comp = newcomp(exec1,exec2,exec3)
+        config = mk_catalog(exec1,exec2,exec3)
         
-        trans = comp.evaluate
-        execs.each do |e| assert(trans.resources.vertex?(e), "%s is not in graph" % e.title) end
+        trans = Puppet::Transaction.new(config)
+        execs.each do |e| assert(config.vertex?(e), "%s is not in graph" % e.title) end
         trans.prepare
-        execs.each do |e| assert(trans.relgraph.vertex?(e), "%s is not in relgraph" % e.title) end
-        reverse = trans.relgraph.reversal
+        execs.each do |e| assert(config.vertex?(e), "%s is not in relgraph" % e.title) end
+        reverse = trans.relationship_graph.reversal
         execs.each do |e| assert(reverse.vertex?(e), "%s is not in reversed graph" % e.title) end
         
-
-        assert_apply(comp)
+        config.apply
 
         assert(FileTest.exists?(file), "File does not exist")
 

data/test/other/overrides.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppettest'
@@ -90,12 +90,10 @@ class TestOverrides < Test::Unit::TestCase
             }
         }
 
-        comp = newcomp("overrides", baseobj)
-        children.each { |child| comp.push child }
+        config = mk_catalog(baseobj, *children)
 
         assert_nothing_raised("Could not eval component") {
-            trans = comp.evaluate
-            trans.evaluate
+            config.apply
         }
 
         files.each { |path, mode|
@@ -107,4 +105,3 @@ class TestOverrides < Test::Unit::TestCase
     end
 end
 
-# $Id: overrides.rb 1896 2006-12-01 04:11:11Z luke $

data/test/other/propertychange.rb

@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2006-12-21.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 
@@ -138,4 +138,3 @@ class TestPropertyChange < Test::Unit::TestCase
     end
 end
 
-# $Id: propertychange.rb 2647 2007-07-04 22:25:23Z luke $

data/test/other/provider.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/provider'
@@ -159,4 +159,3 @@ class TestImpl < Test::Unit::TestCase
     end
 end
 
-# $Id: provider.rb 1793 2006-10-16 22:01:40Z luke $

data/test/other/puppet.rb

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

data/test/other/relationships.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppettest'
@@ -111,7 +111,7 @@ class TestRelationships < Test::Unit::TestCase
         end
     end
     
-    def test_store_relationship
+    def test_munge_relationship
         file = Puppet::Type.newfile :path => tempfile(), :mode => 0755
         execs = []
         3.times do |i|
@@ -122,7 +122,7 @@ class TestRelationships < Test::Unit::TestCase
         result = nil
         [execs[0], [:exec, "yay0"], ["exec", "yay0"]].each do |target|
             assert_nothing_raised do
-                result = file.send(:store_relationship, :require, target)
+                result = file.send(:munge_relationship, :require, target)
             end
         
             assert_equal([[:exec, "yay0"]], result)
@@ -133,7 +133,7 @@ class TestRelationships < Test::Unit::TestCase
         strings = execs.collect { |e| [e.class.name.to_s, e.title] }
         [execs, symbols, strings].each do |target|
             assert_nothing_raised do
-                result = file.send(:store_relationship, :require, target)
+                result = file.send(:munge_relationship, :require, target)
             end
         
             assert_equal(symbols, result)
@@ -141,7 +141,7 @@ class TestRelationships < Test::Unit::TestCase
         
         # Make sure we can mix it up, even though this shouldn't happen
         assert_nothing_raised do
-            result = file.send(:store_relationship, :require, [execs[0], [execs[1].class.name, execs[1].title]])
+            result = file.send(:munge_relationship, :require, [execs[0], [execs[1].class.name, execs[1].title]])
         end
         
         assert_equal([[:exec, "yay0"], [:exec, "yay1"]], result)
@@ -151,7 +151,7 @@ class TestRelationships < Test::Unit::TestCase
         file[:require] = execs[0]
         
         assert_nothing_raised do
-            result = file.send(:store_relationship, :require, [execs[1], execs[2]])
+            result = file.send(:munge_relationship, :require, [execs[1], execs[2]])
         end
         
         assert_equal(symbols, result)
@@ -170,17 +170,16 @@ class TestRelationships < Test::Unit::TestCase
         assert_nothing_raised do
             reqs = exec.autorequire
         end
-        assert_equal([Puppet::Relationship[file, exec]], reqs)
-        
-        # Now make sure that these relationships are added to the transaction's
-        # relgraph
-        trans = Puppet::Transaction.new(newcomp(file, exec))
-        assert_nothing_raised do
-            trans.evaluate
+        assert_instance_of(Puppet::Relationship, reqs[0], "Did not return a relationship edge")
+        assert_equal(file, reqs[0].source, "Did not set the autorequire source correctly")
+        assert_equal(exec, reqs[0].target, "Did not set the autorequire target correctly")
+        
+        # Now make sure that these relationships are added to the 
+        # relationship graph
+        config = mk_catalog(file, exec)
+        config.apply do |trans|
+            assert(config.relationship_graph.edge?(file, exec), "autorequire edge was not created")
         end
-        
-        graph = trans.relgraph
-        assert(graph.edge?(file, exec), "autorequire edge was not created")
     end
     
     def test_requires?
@@ -216,4 +215,3 @@ class TestRelationships < Test::Unit::TestCase
     end
 end
 
-# $Id: relationships.rb 2051 2007-01-05 05:12:37Z luke $

data/test/other/report.rb

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
+require 'puppet/reports'
 require 'puppet/transaction/report'
 require 'puppettest'
 require 'puppettest/reporttesting'
@@ -26,16 +27,10 @@ class TestReports < Test::Unit::TestCase
             )
         end
 
-        comp = newcomp(*objects)
-
-        trans = nil
-        assert_nothing_raised("Failed to create transaction") {
-            trans = comp.evaluate
-        }
-
-        assert_nothing_raised("Failed to evaluate transaction") {
-            trans.evaluate
-        }
+        config = mk_catalog(*objects)
+        # So the report works out.
+        config.retrieval_duration = 0.001
+        trans = config.apply
 
         return trans.generate_report
     end
@@ -92,7 +87,7 @@ class TestReports < Test::Unit::TestCase
         
         # We have to reuse reporting here because of something going on in the
         # server/report.rb file
-        Puppet.config.use(:reporting)
+        Puppet.settings.use(:main, :reporting)
 
         3.times { |i|
             log = Puppet.warning("Report test message %s" % i)
@@ -103,14 +98,14 @@ class TestReports < Test::Unit::TestCase
         }
 
         assert_nothing_raised do
-            report.extend(Puppet::Network::Handler.report.report(:store))
+            report.extend(Puppet::Reports.report(:store))
         end
 
         yaml = YAML.dump(report)
 
         file = nil
         assert_nothing_raised {
-            file = report.process(yaml)
+            file = report.process
         }
 
         assert(FileTest.exists?(file), "report file did not get created")
@@ -119,13 +114,13 @@ class TestReports < Test::Unit::TestCase
 
     if Puppet.features.rrd?
     def test_rrdgraph_report
-        Puppet.config.use(:metrics)
+        Puppet.settings.use(:main, :metrics)
         report = mkreport
 
         assert(! report.metrics.empty?, "Did not receive any metrics")
 
         assert_nothing_raised do
-            report.extend(Puppet::Network::Handler.report.report(:rrdgraph))
+            report.extend(Puppet::Reports.report(:rrdgraph))
         end
 
         assert_nothing_raised {
@@ -160,7 +155,7 @@ class TestReports < Test::Unit::TestCase
     
     def test_tagmail_parsing
         report = Object.new
-        report.extend(Puppet::Network::Handler.report.report(:tagmail))
+        report.extend(Puppet::Reports.report(:tagmail))
         
         passers = File.join(datadir, "reports", "tagmail_passers.conf")
         assert(FileTest.exists?(passers), "no passers file %s" % passers)
@@ -184,7 +179,7 @@ class TestReports < Test::Unit::TestCase
     
     def test_tagmail_parsing_results
         report = Object.new
-        report.extend(Puppet::Network::Handler.report.report(:tagmail))
+        report.extend(Puppet::Reports.report(:tagmail))
         # Now test a few specific lines to make sure we get the results we want
         {
             "tag: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag}, []],
@@ -212,7 +207,7 @@ class TestReports < Test::Unit::TestCase
         
         list = report.logs.collect { |l| l.to_report }
         
-        report.extend(Puppet::Network::Handler.report.report(:tagmail))
+        report.extend(Puppet::Reports.report(:tagmail))
         
         {
             [%w{abuse@domain.com}, %w{all}, []] => list,
@@ -249,4 +244,3 @@ class TestReports < Test::Unit::TestCase
     end
 end
 
-# $Id: report.rb 2459 2007-05-04 05:04:29Z luke $