puppet 0.9.2 → 0.13.0

data/test/parser/parser.rb

@@ -51,8 +51,9 @@ class TestParser < Test::Unit::TestCase
     def test_arrayrvalues
         parser = Puppet::Parser::Parser.new()
         ret = nil
+        file = tempfile()
         assert_nothing_raised {
-            parser.string = 'file { "/tmp/testing": mode => [755, 640] }'
+            parser.string = "file { \"#{file}\": mode => [755, 640] }"
         }
 
         assert_nothing_raised {
@@ -65,7 +66,7 @@ class TestParser < Test::Unit::TestCase
         @@tmpfiles << name
 
         File.open(file, "w") { |f|
-            f.puts "file { \"%s\": create => true, mode => 755 }\n" %
+            f.puts "file { \"%s\": ensure => file, mode => 755 }\n" %
                name
         }
     end
@@ -94,7 +95,7 @@ class TestParser < Test::Unit::TestCase
         }
     end
 
-    def test_zdefaults
+    def test_defaults
         basedir = File.join(tmpdir(), "defaulttesting")
         @@tmpfiles << basedir
         Dir.mkdir(basedir)
@@ -150,6 +151,8 @@ class TestParser < Test::Unit::TestCase
         scope = nil
         assert_nothing_raised("Could not evaluate defaults parse tree") {
             scope = Puppet::Parser::Scope.new()
+            scope.name = "parsetest"
+            scope.type = "parsetest"
             objects = scope.evaluate(ast)
         }
 
@@ -177,4 +180,4 @@ class TestParser < Test::Unit::TestCase
     end
 end
 
-# $Id: parser.rb 724 2005-10-22 22:27:20Z luke $
+# $Id: parser.rb 871 2006-02-07 05:58:00Z luke $

data/test/puppet/conffiles.rb

@@ -27,11 +27,6 @@ class TestConfFiles < Test::Unit::TestCase
             "boo" => {
                 "eb" => "fb"
             },
-            "rah" => {
-                "aa" => "this is a sentence",
-                "ca" => "dk",
-                "ea" => "fk"
-            },
         },
         {
             "puppet" => {
@@ -41,7 +36,7 @@ class TestConfFiles < Test::Unit::TestCase
                 "okay" => "rah"
             },
             "back" => {
-                "okay" => "rah"
+                "yayness" => "rah"
             },
         }
     ]
@@ -54,7 +49,7 @@ class TestConfFiles < Test::Unit::TestCase
             data = data.dup
             str += "[puppet]\n"
             data["puppet"].each { |var, value|
-                str += "%s %s\n" % [var, value]
+                str += "%s = %s\n" % [var, value]
             }
             data.delete("puppet")
         end
@@ -62,7 +57,7 @@ class TestConfFiles < Test::Unit::TestCase
         data.each { |type, settings|
             str += "[%s]\n" % type
             settings.each { |var, value|
-                str += "%s %s\n" % [var, value]
+                str += "%s = %s\n" % [var, value]
             }
         }
 
@@ -81,18 +76,23 @@ class TestConfFiles < Test::Unit::TestCase
         path = tempfile()
 
         sampledata { |data|
+            config = Puppet::Config.new
+            data.each { |section, hash|
+                hash.each { |param, value|
+                    config.setdefaults(section, [param, value, value])
+                }
+            }
             # Write it out as a config file
             File.open(path, "w") { |f| f.print data2config(data) }
-            config = nil
             assert_nothing_raised {
-                config = Puppet::Config.new(path)
+                config.parse(path)
             }
 
             data.each { |section, hash|
                 hash.each { |var, value|
                     assert_equal(
                         data[section][var],
-                        config[section][var],
+                        config[var],
                         "Got different values at %s/%s" % [section, var]
                     )
                 }
@@ -101,4 +101,4 @@ class TestConfFiles < Test::Unit::TestCase
     end
 end
 
-# $Id: conffiles.rb 738 2005-10-31 22:50:09Z luke $
+# $Id: conffiles.rb 873 2006-02-07 23:12:33Z luke $

data/test/puppet/defaults.rb

@@ -5,13 +5,15 @@ if __FILE__ == $0
 end
 
 require 'puppet'
+require 'puppettest'
 require 'test/unit'
 
-# $Id: defaults.rb 724 2005-10-22 22:27:20Z luke $
+# $Id: defaults.rb 873 2006-02-07 23:12:33Z luke $
 
 class TestPuppetDefaults < Test::Unit::TestCase
-    @@dirs = %w{rrddir puppetconf puppetvar logdir statedir}
-    @@files = %w{logfile checksumfile manifest masterlog}
+    include TestPuppet
+    @@dirs = %w{rrddir confdir vardir logdir statedir}
+    @@files = %w{statefile manifest masterlog}
     @@normals = %w{puppetport masterport server}
     @@booleans = %w{rrdgraph noop}
 
@@ -41,8 +43,8 @@ class TestPuppetDefaults < Test::Unit::TestCase
 
     if __FILE__ == $0
         def disabled_testContained
-            confdir = Regexp.new(Puppet[:puppetconf])
-            vardir = Regexp.new(Puppet[:puppetvar])
+            confdir = Regexp.new(Puppet[:confdir])
+            vardir = Regexp.new(Puppet[:vardir])
             [@@dirs,@@files].flatten.each { |param|
                 value = Puppet[param]
 
@@ -60,8 +62,8 @@ class TestPuppetDefaults < Test::Unit::TestCase
     end
 
     def testFailOnBogusArgs
-        [0, "ashoweklj", ";", :thisisafakesymbol].each { |param|
-            assert_raise(ArgumentError) { Puppet[param] }
+        [0, "ashoweklj", ";"].each { |param|
+            assert_raise(ArgumentError, "No error on %s" % param) { Puppet[param] }
         }
     end
 
@@ -77,7 +79,7 @@ class TestPuppetDefaults < Test::Unit::TestCase
             value = Puppet[param]
 
             unless value !~ notval
-                assert_nothing_raised { raise "%s is in wrong dir: %s" %
+                assert_nothing_raised { raise "%s is incorrectly set to %s" %
                     [param,value] }
             end
         }
@@ -85,15 +87,15 @@ class TestPuppetDefaults < Test::Unit::TestCase
 
     def test_settingdefaults
         testvals = {
-            :fakeparam => [:puppetconf, "yaytest"],
-            :anotherparam => proc { File.join(Puppet[:puppetvar], "goodtest") },
+            :fakeparam => "$confdir/yaytest",
+            :anotherparam => "$vardir/goodtest",
             :string => "a yay string",
             :boolean => true
         }
 
         testvals.each { |param, default|
             assert_nothing_raised {
-                Puppet.setdefault(param,default)
+                Puppet.setdefaults("testing", [param, default, "a value"])
             }
         }
     end

data/test/puppet/utiltest.rb

@@ -12,6 +12,8 @@ class TestPuppetUtil < Test::Unit::TestCase
     include TestPuppet
     unless Process.uid == 0
         $stderr.puts "Run as root to perform Utility tests"
+        def test_nothing
+        end
     else
 
     def mknverify(file, user, group = nil, id = false)
@@ -74,16 +76,17 @@ class TestPuppetUtil < Test::Unit::TestCase
             )
             #system("ls -l %s" % file)
         end
-        if gid == 0
-            #Puppet.warning "Not testing group"
-        else
-            #Puppet.warning "Testing group %s" % gid
-            assert_equal(File.stat(file).gid, gid,
-                "File group is %s instead of %s" %
-                [File.stat(file).gid, gid]
-            )
-            #system("ls -l %s" % file)
-        end
+        # I'm skipping these, because it seems so system dependent.
+        #if gid == 0
+        #    #Puppet.warning "Not testing group"
+        #else
+        #    Puppet.warning "Testing group %s" % gid.inspect
+        #    system("ls -l %s" % file)
+        #    assert_equal(gid, File.stat(file).gid,
+        #        "File group is %s instead of %s" %
+        #        [File.stat(file).gid, gid]
+        #    )
+        #end
         assert_nothing_raised {
             File.unlink(file)
         }
@@ -117,4 +120,4 @@ class TestPuppetUtil < Test::Unit::TestCase
     end
 end
 
-# $Id: utiltest.rb 743 2005-11-16 21:39:31Z luke $
+# $Id: utiltest.rb 816 2006-01-12 21:04:06Z luke $

data/test/puppettest.rb

@@ -7,12 +7,15 @@ require 'puppet'
 require 'test/unit'
 
 module TestPuppet
-    def newcomp(name,*ary)
-        if name.is_a?(Puppet::Type)
-            ary.unshift name
-            name = name.name
+    def newcomp(*ary)
+        name = nil
+        if ary[0].is_a?(String)
+            name = ary.shift
+        else
+            name = ary[0].name
         end
-        comp = Puppet::Type::Component.create(
+
+        comp = Puppet.type(:component).create(
             :name => name
         )
         ary.each { |item| comp.push item }
@@ -28,11 +31,11 @@ module TestPuppet
         end
 
         @configpath = File.join(tmpdir,
-            self.class.to_s + "configdir" + @@testcount.to_s
+            self.class.to_s + "configdir" + @@testcount.to_s + "/"
         )
 
-        Puppet[:puppetconf] = @configpath
-        Puppet[:puppetvar] = @configpath
+        Puppet[:confdir] = @configpath
+        Puppet[:vardir] = @configpath
 
         unless File.exists?(@configpath)
             Dir.mkdir(@configpath)
@@ -42,35 +45,37 @@ module TestPuppet
         @@tmppids = []
 
         if $0 =~ /.+\.rb/ or Puppet[:debug]
-            Puppet[:logdest] = :console
-            Puppet[:loglevel] = :debug
+            Puppet::Log.newdestination :console
+            Puppet::Log.level = :debug
             $VERBOSE = 1
         else
             Puppet::Log.close
-            Puppet[:logdest] = "/dev/null"
+            Puppet::Log.newdestination "/dev/null"
             Puppet[:httplog] = "/dev/null"
         end
+
+        Puppet[:ignoreschedules] = true
     end
 
 
     def spin
         # Just disable spin, unless we really need it
         return
-        if Puppet[:debug]
-            return
-        end
-        @modes = %w{| / - \\}
-        unless defined? @mode
-            @mode = 0
-        end
-
-        $stderr.print "%s" % @modes[@mode]
-        if @mode == @modes.length - 1
-            @mode = 0
-        else
-            @mode += 1
-        end
-        $stderr.flush
+#        if Puppet[:debug]
+#            return
+#        end
+#        @modes = %w{| / - \\}
+#        unless defined? @mode
+#            @mode = 0
+#        end
+#
+#        $stderr.print "%s" % @modes[@mode]
+#        if @mode == @modes.length - 1
+#            @mode = 0
+#        else
+#            @mode += 1
+#        end
+#        $stderr.flush
     end
 
     # stop any services that might be hanging around
@@ -78,7 +83,7 @@ module TestPuppet
         if stype = Puppet::Type.type(:service)
             stype.each { |service|
                 service[:running] = false
-                service.sync
+                service.evaluate
             }
         end
     end
@@ -96,12 +101,17 @@ module TestPuppet
         @@tmppids.each { |pid|
             %x{kill -INT #{pid} 2>/dev/null}
         }
+
         @@tmppids.clear
         Puppet::Type.allclear
+        Puppet::Storage.clear
         Puppet.clear
 
         # reset all of the logs
         Puppet::Log.close
+
+        # Just in case there are processes waiting to die...
+        Process.waitall
     end
 
     def tempfile
@@ -115,7 +125,7 @@ module TestPuppet
         return f
     end
 
-    def testdir
+    def tstdir
         if defined? @testdirnum
             @testdirnum += 1
         else
@@ -135,6 +145,7 @@ module TestPuppet
                 "/tmp"
             end
 
+
             @tmpdir = File.join(@tmpdir, "puppettesting")
 
             unless File.exists?(@tmpdir)
@@ -145,18 +156,66 @@ module TestPuppet
         @tmpdir
     end
 
-    def assert_rollback_events(trans, events, msg)
-        run_events(:rollback, trans, events, msg)
+    def assert_rollback_events(events, trans, msg = nil)
+        run_events(:rollback, events, trans, msg)
     end
 
-    def assert_events(comp, events, msg = nil)
+    def assert_events(events, *items)
         trans = nil
+        comp = nil
+        msg = nil
+
+        unless events.is_a? Array
+            raise Puppet::DevError, "Incorrect call of assert_events"
+        end
+        if items[-1].is_a? String
+            msg = items.pop
+        end
+
+        remove_comp = false
+        # They either passed a comp or a list of items.
+        if items[0].is_a? Puppet.type(:component)
+            comp = items.shift
+        else
+            comp = newcomp(items[0].name, *items)
+            remove_comp = true
+        end
         msg ||= comp.name
         assert_nothing_raised("Component %s failed" % [msg]) {
             trans = comp.evaluate
         }
 
         run_events(:evaluate, trans, events, msg)
+
+        if remove_comp
+            Puppet.type(:component).delete(comp)
+        end
+
+        return trans
+    end
+
+    # A simpler method that just applies what we have.
+    def assert_apply(*objects)
+        if objects[0].is_a?(Puppet.type(:component))
+            comp = objects.shift
+            unless objects.empty?
+                objects.each { |o| comp.push o }
+            end
+        else
+            comp = newcomp(*objects)
+        end
+        trans = nil
+
+        assert_nothing_raised("Failed to create transaction") {
+            trans = comp.evaluate
+        }
+
+        events = nil
+        assert_nothing_raised("Failed to evaluate transaction") {
+            events = trans.evaluate.collect { |e| e.event }
+        }
+        Puppet.type(:component).delete(comp)
+        events
     end
 
     def run_events(type, trans, events, msg)
@@ -195,6 +254,23 @@ module TestPuppet
             end
         }
     end
+
+    # If there are any fake data files, retrieve them
+    def fakedata(dir)
+
+        ary = [$puppetbase, "test"]
+        ary += dir.split("/")
+        dir = File.join(ary)
+
+        unless FileTest.exists?(dir)
+            raise Puppet::DevError, "No fakedata dir %s" % dir
+        end
+        files = Dir.entries(dir).reject { |f| f =~ /^\./ }.collect { |f|
+            File.join(dir, f)
+        }
+
+        return files
+    end
 end
 
 
@@ -212,11 +288,11 @@ module ServerTest
 
     # create a simple manifest that just creates a file
     def mktestmanifest
-        file = File.join(Puppet[:puppetconf], "%ssite.pp" % (self.class.to_s + "test"))
+        file = File.join(Puppet[:confdir], "%ssite.pp" % (self.class.to_s + "test"))
         @createdfile = File.join(tmpdir(), self.class.to_s + "servermanifesttesting")
 
         File.open(file, "w") { |f|
-            f.puts "file { \"%s\": create => true, mode => 755 }\n" % @createdfile
+            f.puts "file { \"%s\": ensure => file, mode => 755 }\n" % @createdfile
         }
 
         @@tmpfiles << @createdfile
@@ -265,15 +341,41 @@ end
 
 module ExeTest
     include ServerTest
-    unless ENV["PATH"] =~ /puppet/
-        # ok, we have to add the bin directory to our search path
-        ENV["PATH"] += ":" + File.join($puppetbase, "bin")
 
-        # and then the library directories
-        libdirs = $:.find_all { |dir|
+    def setup
+        super
+        setbindir
+        setlibdir
+    end
+
+    def bindir
+        File.join($puppetbase, "bin")
+    end
+
+    def setbindir
+        unless ENV["PATH"] =~ /puppet/
+            ENV["PATH"] += ":" + bindir
+        end
+    end
+
+    def setlibdir
+        ENV["RUBYLIB"] = $:.find_all { |dir|
             dir =~ /puppet/ or dir =~ /\.\./
+        }.join(":")
+    end
+
+    # Run a ruby command.  This explicitly uses ruby to run stuff, since we
+    # don't necessarily know where our ruby binary is, dernit.
+    # Currently unused, because I couldn't get it to work.
+    def rundaemon(*cmd)
+        @ruby ||= %x{which ruby}.chomp
+        cmd = cmd.unshift(@ruby).join(" ")
+
+        out = nil
+        Dir.chdir(bindir()) {
+            out = %x{#{@ruby} #{cmd}}
         }
-        ENV["RUBYLIB"] = libdirs.join(":")
+        return out
     end
 
     def startmasterd(args = "")
@@ -281,11 +383,17 @@ module ExeTest
 
         manifest = mktestmanifest()
         args += " --manifest %s" % manifest
-        args += " --confdir %s" % Puppet[:puppetconf]
-        args += " --vardir %s" % Puppet[:puppetvar]
-        args += " --port %s" % @@port
+        args += " --confdir %s" % Puppet[:confdir]
+        args += " --vardir %s" % Puppet[:vardir]
+        args += " --masterport %s" % @@port
+        args += " --user %s" % Process.uid
+        args += " --group %s" % Process.gid
         args += " --nonodes"
-        args += " --autosign"
+        args += " --autosign true"
+
+        #if Puppet[:debug]
+        #    args += " --debug"
+        #end
 
         cmd = "puppetmasterd %s" % args
 
@@ -293,8 +401,8 @@ module ExeTest
         assert_nothing_raised {
             output = %x{#{cmd}}.chomp
         }
-        assert($? == 0, "Puppetmasterd exit status was %s" % $?)
         assert_equal("", output, "Puppetmasterd produced output %s" % output)
+        assert($? == 0, "Puppetmasterd exit status was %s" % $?)
         sleep(1)
 
         return manifest
@@ -303,7 +411,7 @@ module ExeTest
     def stopmasterd(running = true)
         ps = Facter["ps"].value || "ps -ef"
 
-        pidfile = File.join(Puppet[:puppetvar], "puppetmasterd.pid")
+        pidfile = File.join(Puppet[:vardir], "run", "puppetmasterd.pid")
 
         pid = nil
         if FileTest.exists?(pidfile)
@@ -714,10 +822,10 @@ class PuppetTestSuite
     end
 
     def self.list
-        puts "testdir is %s" % self.basedir
         Dir.entries(self.basedir).find_all { |file|
             path = File.join(@basedir, file)
-            FileTest.directory?(path) and file !~ /^\./
+            # Data is for storing test data
+            FileTest.directory?(path) and file !~ /^\./ and file != "data"
         }
     end
 
@@ -771,4 +879,4 @@ def failers
     }
 end
 
-# $Id: puppettest.rb 750 2005-11-22 05:34:43Z luke $
+# $Id: puppettest.rb 873 2006-02-07 23:12:33Z luke $