puppet 0.16.0 → 0.18.4

data/test/puppet/utiltest.rb

@@ -164,17 +164,22 @@ class TestPuppetUtil < Test::Unit::TestCase
 
         # First test it with the normal args
         assert_nothing_raised do
-            val = Puppet::Util.benchmark(:notice, "Read file") do
-                File.read(path)
+            val = nil
+            result = Puppet::Util.benchmark(:notice, "Read file") do
+                val = File.read(path)
             end
 
             assert_equal(str, val)
+
+            assert_instance_of(Float, result)
+
         end
 
         # Now test it with a passed object
         assert_nothing_raised do
-            val = Puppet::Util.benchmark(Puppet, :notice, "Read file") do
-                File.read(path)
+            val = nil
+            Puppet::Util.benchmark(Puppet, :notice, "Read file") do
+                val = File.read(path)
             end
 
             assert_equal(str, val)
@@ -291,4 +296,4 @@ class TestPuppetUtil < Test::Unit::TestCase
     end
 end
 
-# $Id: utiltest.rb 1098 2006-04-10 22:13:10Z luke $
+# $Id: utiltest.rb 1358 2006-07-04 16:07:47Z luke $

data/test/puppettest.rb

@@ -7,6 +7,12 @@ require 'puppet'
 require 'test/unit'
 
 module TestPuppet
+    include ObjectSpace
+
+    def gcdebug(type)
+        Puppet.warning "%s: %s" % [type, ObjectSpace.each_object(type) { |o| }]
+    end
+
     def newcomp(*ary)
         name = nil
         if ary[0].is_a?(String)
@@ -18,7 +24,9 @@ module TestPuppet
         comp = Puppet.type(:component).create(
             :name => name
         )
-        ary.each { |item| comp.push item }
+        ary.each { |item|
+            comp.push item
+        }
 
         return comp
     end
@@ -57,7 +65,8 @@ module TestPuppet
         if $0 =~ /.+\.rb/ or Puppet[:debug]
             Puppet::Log.newdestination :console
             Puppet::Log.level = :debug
-            $VERBOSE = 1
+            #$VERBOSE = 1
+            Puppet.info @method_name
         else
             Puppet::Log.close
             Puppet::Log.newdestination tempfile()
@@ -130,6 +139,7 @@ module TestPuppet
         @@tmppids.clear
         Puppet::Type.allclear
         Puppet::Storage.clear
+        Puppet::Rails.clear
         Puppet.clear
 
         @memoryatend = Puppet::Util.memory
@@ -160,7 +170,8 @@ module TestPuppet
             @@tmpfilenum = 1
         end
 
-        f = File.join(self.tmpdir(), self.class.to_s + "testfile" + @@tmpfilenum.to_s)
+        f = File.join(self.tmpdir(), self.class.to_s + "_" + @method_name +
+            @@tmpfilenum.to_s)
         @@tmpfiles << f
         return f
     end
@@ -171,7 +182,7 @@ module TestPuppet
         else
             @@testdirnum = 1
         end
-        d = File.join(self.tmpdir(), self.class.to_s + "testdir" + @@testdirnum.to_s)
+        d = File.join(self.tmpdir(), self.class.to_s + "_" + @method_name + @@testdirnum.to_s)
         @@tmpfiles << d
         return d
     end
@@ -297,7 +308,6 @@ module TestPuppet
 
     # If there are any fake data files, retrieve them
     def fakedata(dir)
-
         ary = [$puppetbase, "test"]
         ary += dir.split("/")
         dir = File.join(ary)
@@ -312,6 +322,16 @@ module TestPuppet
         return files
     end
 
+    def fakefile(name)
+        ary = [$puppetbase, "test"]
+        ary += name.split("/")
+        file = File.join(ary)
+        unless FileTest.exists?(file)
+            raise Puppet::DevError, "No fakedata file %s" % file
+        end
+        return file
+    end
+
     # wrap how to retrieve the masked mode
     def filemode(file)
         File.stat(file).mode & 007777
@@ -331,14 +351,16 @@ module ServerTest
         if defined? @@port
             @@port += 1
         else
-            @@port = 8085
+            @@port = 20000
         end
     end
 
     # create a simple manifest that just creates a file
     def mktestmanifest
         file = File.join(Puppet[:confdir], "%ssite.pp" % (self.class.to_s + "test"))
-        @createdfile = File.join(tmpdir(), self.class.to_s + "servermanifesttesting")
+        #@createdfile = File.join(tmpdir(), self.class.to_s + "manifesttesting" +
+        #    "_" + @method_name)
+        @createdfile = tempfile()
 
         File.open(file, "w") { |f|
             f.puts "file { \"%s\": ensure => file, mode => 755 }\n" % @createdfile
@@ -454,6 +476,11 @@ module ExeTest
         assert($? == 0, "Puppetmasterd exit status was %s" % $?)
         sleep(1)
 
+        cleanup do
+            stopmasterd
+            sleep(1)
+        end
+
         return manifest
     end
 
@@ -474,8 +501,9 @@ module ExeTest
             %x{#{ps}}.chomp.split(/\n/).each { |line|
                 if line =~ /ruby.+puppetmasterd/
                     next if line =~ /\.rb/ # skip the test script itself
+                    next if line =~ /^puppet/ # skip masters running as 'puppet'
                     ary = line.sub(/^\s+/, '').split(/\s+/)
-                    runningpid = ary[1].to_i
+                    pid = ary[1].to_i
                 end
             }
 
@@ -487,9 +515,11 @@ module ExeTest
             if pid == $$
                 raise Puppet::Error, "Tried to kill own pid"
             end
-            assert_nothing_raised {
-                Process.kill("-INT", pid)
-            }
+            begin
+                Process.kill(:INT, pid)
+            rescue
+                # ignore it
+            end
         end
     end
 
@@ -789,18 +819,31 @@ module ParserTesting
         }
     end
 
-    def fileobj(path, hash = {"owner" => "root"})
-        assert_nothing_raised("Could not create file %s" % path) {
+    def objectdef(type, name, params)
+        assert_nothing_raised("Could not create %s %s" % [type, name]) {
             return AST::ObjectDef.new(
-                :file => tempfile(),
-                :line => rand(100),
-                :name => stringobj(path),
-                :type => nameobj("file"),
-                :params => objectinst(hash)
+                :file => __FILE__,
+                :line => __LINE__,
+                :name => stringobj(name),
+                :type => nameobj(type),
+                :params => objectinst(params)
             )
         }
     end
 
+    def fileobj(path, hash = {"owner" => "root"})
+        assert_nothing_raised("Could not create file %s" % path) {
+            return objectdef("file", path, hash)
+#            return AST::ObjectDef.new(
+#                :file => tempfile(),
+#                :line => rand(100),
+#                :name => stringobj(path),
+#                :type => nameobj("file"),
+#                :params => objectinst(hash)
+#            )
+        }
+    end
+
     def nameobj(name)
         assert_nothing_raised("Could not create name %s" % name) {
             return AST::Name.new(
@@ -851,12 +894,16 @@ module ParserTesting
     end
 
     def objectparam(param, value)
+        # Allow them to pass non-strings in
+        if value.is_a?(String)
+            value = stringobj(value)
+        end
         assert_nothing_raised("Could not create param %s" % param) {
             return AST::ObjectParam.new(
                 :file => tempfile(),
                 :line => rand(100),
                 :param => nameobj(param),
-                :value => stringobj(value)
+                :value => value
             )
         }
     end
@@ -870,12 +917,15 @@ module ParserTesting
     end
 
     def varobj(name, value)
+        unless value.is_a? AST
+            value = stringobj(value)
+        end
         assert_nothing_raised("Could not create %s code" % name) {
             return AST::VarDef.new(
                 :file => tempfile(),
                 :line => rand(100),
                 :name => nameobj(name),
-                :value => stringobj(value)
+                :value => value
             )
         }
     end
@@ -923,6 +973,128 @@ module ParserTesting
             )
         }
     end
+
+    def taggedobj(name, ftype = :statement)
+        functionobj("tagged", name, ftype)
+    end
+
+    def functionobj(function, name, ftype = :statement)
+        func = nil
+        assert_nothing_raised do
+            func = Puppet::Parser::AST::Function.new(
+                :name => function,
+                :ftype => ftype,
+                :arguments => AST::ASTArray.new(
+                    :children => [nameobj(name)]
+                )
+            )
+        end
+
+        return func
+    end
+
+    # This assumes no nodes
+    def assert_creates(manifest, *files)
+        interp = nil
+        assert_nothing_raised {
+            interp = Puppet::Parser::Interpreter.new(
+                :Manifest => manifest,
+                :UseNodes => false
+            )
+        }
+
+        config = nil
+        assert_nothing_raised {
+            config = interp.run(Facter["hostname"].value, {})
+        }
+
+        comp = nil
+        assert_nothing_raised {
+            comp = config.to_type
+        }
+
+        assert_apply(comp)
+    end
+
+    def mk_transobject(file = "/etc/passwd")
+        obj = nil
+        assert_nothing_raised {
+            obj = Puppet::TransObject.new("file", file)
+            obj["owner"] = "root"
+            obj["mode"] = "644"
+        }
+
+        return obj
+    end
+
+    def mk_transbucket(*objects)
+        bucket = nil
+        assert_nothing_raised {
+            bucket = Puppet::TransBucket.new
+            bucket.name = "yayname"
+            bucket.type = "yaytype"
+        }
+
+        objects.each { |o| bucket << o }
+
+        return bucket
+    end
+
+    # Make a tree of objects, yielding if desired
+    def mk_transtree(depth = 4, width = 2)
+        top = nil
+        assert_nothing_raised {
+            top = Puppet::TransBucket.new
+            top.name = "top"
+            top.type = "bucket"
+        }
+
+        bucket = top
+
+        file = tempfile()
+        depth.times do |i|
+            objects = []
+            width.times do |j|
+                path = tempfile + i.to_s
+                obj = Puppet::TransObject.new("file", path)
+                obj["owner"] = "root"
+                obj["mode"] = "644"
+
+                # Yield, if they want
+                if block_given?
+                    yield(obj, i, j)
+                end
+
+                objects << obj
+            end
+
+            newbucket = mk_transbucket(*objects)
+
+            bucket.push newbucket
+            bucket = newbucket
+        end
+
+        return top
+    end
+
+    # Take a list of AST objects, evaluate them, and return the results
+    def assert_evaluate(children)
+        top = nil
+        assert_nothing_raised("Could not create top object") {
+            top = AST::ASTArray.new(
+                :children => children
+            )
+        }
+
+        trans = nil
+        scope = nil
+        assert_nothing_raised {
+            scope = Puppet::Parser::Scope.new()
+            trans = scope.evaluate(:ast => top)
+        }
+
+        return trans
+    end
 end
 
 class PuppetTestSuite
@@ -995,4 +1167,4 @@ def failers
     }
 end
 
-# $Id: puppettest.rb 1113 2006-04-17 16:15:33Z luke $
+# $Id: puppettest.rb 1422 2006-07-22 03:32:56Z luke $

data/test/server/authstore.rb

@@ -114,9 +114,9 @@ class TestAuthStore < Test::Unit::TestCase
             assert(store.allowed?("hosttest.com", ip), "IP %s not allowed" % ip)
         }
 
-        assert_raise(Puppet::Server::AuthStoreError) {
-            store.allow("192.168.674.0")
-        }
+        #assert_raise(Puppet::Server::AuthStoreError) {
+        #    store.allow("192.168.674.0")
+        #}
 
         assert_raise(Puppet::Server::AuthStoreError) {
             store.allow("192.168.0")
@@ -203,7 +203,16 @@ class TestAuthStore < Test::Unit::TestCase
             assert(store.allowed?(*ary), "Failed to allow %s" % [ary.join(",")])
         }
     end
+
+    # Make sure people can specify TLDs
+    def test_match_tlds
+        store = mkstore
+
+        assert_nothing_raised {
+            store.allow("*.tld")
+        }
+    end
 end
 
-# $Id: authstore.rb 742 2005-11-16 17:12:11Z luke $
+# $Id: authstore.rb 1271 2006-06-13 23:49:53Z luke $
 

data/test/server/bucket.rb

@@ -22,9 +22,10 @@ class TestBucket < Test::Unit::TestCase
             @num = 1
         end
 
-        Puppet.err "#{Process.pid}: %s: %s" % [@num, memory()]
-        GC.start
+        #Puppet.err "#{Process.pid}: %s: %s" % [@num, memory()]
+        #gcdebug(String)
     end
+
     # run through all of the files and exercise the filebucket methods
     def checkfiles(client)
         files = filelist()
@@ -66,6 +67,9 @@ class TestBucket < Test::Unit::TestCase
             assert(tsum == osum)
 
             # modify our tmp file
+            unless FileTest.writable?(tmppath)
+                File.chmod(0644, tmppath)
+            end
             File.open(tmppath,File::WRONLY|File::TRUNC) { |wf|
                 wf.print "This is some test text\n"
             }
@@ -109,7 +113,7 @@ class TestBucket < Test::Unit::TestCase
         end
 
         %w{
-            who bash vim sh uname /etc/passwd /etc/syslog.conf /etc/hosts 
+            who bash sh uname /etc/passwd /etc/syslog.conf /etc/hosts 
         }.each { |file|
             # if it's fully qualified, just add it
             if file =~ /^\//
@@ -136,9 +140,7 @@ class TestBucket < Test::Unit::TestCase
 
     def setup
         super
-        @bucket = File.join(Puppet[:confdir], "buckettesting")
-
-        @@tmpfiles << @bucket
+        @bucket = tempfile()
     end
 
     #def teardown
@@ -234,8 +236,31 @@ class TestBucket < Test::Unit::TestCase
         unless pid
             raise "Uh, we don't have a child pid"
         end
-        system("kill %s" % pid)
+        Process.kill("TERM", pid)
+    end
+
+    def test_no_path_duplicates
+        bucket = nil
+        assert_nothing_raised {
+            bucket = Puppet::Server::FileBucket.new(
+                :Bucket => @bucket
+            )
+        }
+
+        sum = nil
+        assert_nothing_raised {
+            sum = bucket.addfile("yayness", "/my/file")
+        }
+        assert_nothing_raised {
+            bucket.addfile("yayness", "/my/file")
+        }
+
+        pathfile = File.join(bucket.path, sum, "paths")
+
+        assert(FileTest.exists?(pathfile), "No path file at %s" % pathfile)
+
+        assert_equal("/my/file\n", File.read(pathfile))
     end
 end
 
-# $Id: bucket.rb 1129 2006-04-21 19:14:59Z luke $
+# $Id: bucket.rb 1392 2006-07-11 20:58:25Z luke $