puppet 0.9.2 → 0.13.0

data/test/server/bucket.rb

@@ -122,7 +122,7 @@ class TestBucket < Test::Unit::TestCase
 
     def setup
         super
-        @bucket = File.join(Puppet[:puppetconf], "buckettesting")
+        @bucket = File.join(Puppet[:confdir], "buckettesting")
 
         @@tmpfiles << @bucket
     end
@@ -224,4 +224,4 @@ class TestBucket < Test::Unit::TestCase
     end
 end
 
-# $Id: bucket.rb 742 2005-11-16 17:12:11Z luke $
+# $Id: bucket.rb 873 2006-02-07 23:12:33Z luke $

data/test/server/fileserver.rb

@@ -151,7 +151,7 @@ class TestFileServer < Test::Unit::TestCase
         }
 
         assert_nothing_raised {
-            file = Puppet::Type::PFile[tmpfile]
+            file = Puppet.type(:file)[tmpfile]
         }
 
         output = "/\tfile"
@@ -317,7 +317,7 @@ class TestFileServer < Test::Unit::TestCase
 
 
         # create a deep dir
-        basedir = "/tmp/remotefilecopying"
+        basedir = tempfile()
         testdir = "%s/with/some/sub/directories/for/testing" % basedir
         oldfile = File.join(testdir, "oldfile")
         assert_nothing_raised {
@@ -358,7 +358,7 @@ class TestFileServer < Test::Unit::TestCase
             )
         }
 
-        basedir = "/tmp/remotefilecopying"
+        basedir = tempfile()
         dirs = %w{a set of directories}
         assert_nothing_raised {
             Dir.mkdir(basedir)
@@ -385,7 +385,7 @@ class TestFileServer < Test::Unit::TestCase
     # verify that 'describe' works as advertised
     def test_describe
         server = nil
-        testdir = "/tmp/remotefilecopying"
+        testdir = tempfile()
         files = mktestfiles(testdir)
 
         file = nil
@@ -631,7 +631,7 @@ class TestFileServer < Test::Unit::TestCase
     def test_filereread
         server = nil
 
-        dir = testdir()
+        dir = tstdir()
 
         files = mktestfiles(dir)
 
@@ -706,5 +706,5 @@ class TestFileServer < Test::Unit::TestCase
     end
 end
 
-# $Id: fileserver.rb 742 2005-11-16 17:12:11Z luke $
+# $Id: fileserver.rb 805 2006-01-12 01:58:19Z luke $
 

data/test/server/logger.rb

@@ -13,6 +13,12 @@ require 'cgi'
 class TestLogger < Test::Unit::TestCase
 	include ServerTest
 
+    def setup
+        super
+        #Puppet[:debug] = true
+        Puppet::Log.newdestination :console
+    end
+
     # Test the log driver manually
     def test_localaddlog
         logger = nil
@@ -23,7 +29,7 @@ class TestLogger < Test::Unit::TestCase
         msg = nil
         assert_nothing_raised {
             msg = Puppet::Log.create(
-                :level => :info,
+                :level => :warning,
                 :message => "This is a message"
             )
         }
@@ -43,13 +49,13 @@ class TestLogger < Test::Unit::TestCase
         msg = nil
         assert_nothing_raised {
             msg = Puppet::Log.create(
-                :level => :info,
+                :level => :warning,
                 :message => "This is a remote message"
             )
         }
 
         assert_nothing_raised {
-            msg = CGI.escape(Marshal::dump(msg))
+            msg = CGI.escape(YAML.dump(msg))
         }
         assert_nothing_raised {
             logger.addlog(msg, "localhost", "127.0.0.1")
@@ -66,12 +72,12 @@ class TestLogger < Test::Unit::TestCase
         msg = nil
         assert_nothing_raised {
             msg = Puppet::Log.create(
-                :level => :info,
+                :level => :warning,
                 :message => "This is a logclient message"
             )
         }
 
-        msg = CGI.escape(Marshal::dump(msg))
+        msg = CGI.escape(YAML.dump(msg))
 
         assert_nothing_raised {
             client.addlog(msg, "localhost", "127.0.0.1")
@@ -79,12 +85,14 @@ class TestLogger < Test::Unit::TestCase
     end
 
     # And now test over the network
-    def test_logclient
+    # This test is disabled, since it doesn't work well and it's not the right
+    # solution anyway.
+    def disabled_test_logclient
         pid = nil
         clientlog = tempfile()
         serverlog = tempfile()
         Puppet.warning "serverlog is %s" % serverlog
-        Puppet[:logdest] = clientlog
+        Puppet::Log.newdestination clientlog
         Puppet::Log.close(:syslog)
 
         # For testing
@@ -105,7 +113,7 @@ class TestLogger < Test::Unit::TestCase
         # Start our server
         serverpid = fork {
             Puppet::Log.close(clientlog)
-            Puppet[:logdest] = serverlog
+            Puppet::Log.newdestination serverlog
             assert_nothing_raised() {
                 trap(:INT) { logger.shutdown }
                 logger.start
@@ -132,7 +140,7 @@ class TestLogger < Test::Unit::TestCase
             :warning => "XMLRPC2",
             :err => "XMLRPC3"
         }.each { |level, str|
-            msg = CGI.escape(Marshal::dump(Puppet::Log.create(
+            msg = CGI.escape(YAML.dump(Puppet::Log.create(
                 :level => level,
                 :message => str
             )))
@@ -144,7 +152,7 @@ class TestLogger < Test::Unit::TestCase
         # and now use the normal client action
 
         # Set the log destination to be the server
-        Puppet[:logdest] = "localhost:%s" % @@port
+        Puppet::Log.newdestination "localhost:%s" % @@port
 
         # And now do some logging
         assert_nothing_raised {
@@ -172,4 +180,4 @@ class TestLogger < Test::Unit::TestCase
     end
 end
 
-# $Id: logger.rb 751 2005-11-22 05:54:25Z luke $
+# $Id: logger.rb 873 2006-02-07 23:12:33Z luke $

data/test/server/master.rb

@@ -114,7 +114,7 @@ class TestMaster < Test::Unit::TestCase
                 :File => manifest,
                 :UseNodes => false,
                 :Local => true,
-                :FileTimeout => 0.5
+                :FileTimeout => 15
             )
         }
         assert_nothing_raised() {
@@ -123,28 +123,57 @@ class TestMaster < Test::Unit::TestCase
             )
         }
 
+        # The client doesn't have a config, so it can't be up to date
+        assert(! client.fresh?, "Client is incorrectly up to date")
+
         assert_nothing_raised {
             client.getconfig
             client.apply
         }
 
+        # Now it should be up to date
+        assert(client.fresh?, "Client is not up to date")
+
+        # Cache this value for later
+        parse1 = master.freshness
+
+        # Verify the config got applied
         assert(FileTest.exists?(@createdfile),
             "Created file %s does not exist" % @createdfile)
-        sleep 1
         Puppet::Type.allclear
 
+        sleep 1.5
+        # Create a new manifest
         File.open(manifest, "w") { |f|
-            f.puts "file { \"%s\": create => true }\n" % file2
+            f.puts "file { \"%s\": ensure => file }\n" % file2
+        }
+
+        # Verify that the master doesn't immediately reparse the file; we
+        # want to wait through the timeout
+        assert_equal(parse1, master.freshness, "Master did not wait through timeout")
+        assert(client.fresh?, "Client is not up to date")
+
+        assert_nothing_raised("Could not resent the file timeout") {
+            master.filetimeout = 0
         }
+        assert_equal(0, master.filetimeout)
+
+        # Now make sure the master does reparse
+        #Puppet.notice "%s vs %s" % [parse1, master.freshness]
+        assert(parse1 != master.freshness, "Master did not reparse file")
+        assert(! client.fresh?, "Client is incorrectly up to date")
+
+        # Retrieve and apply the new config
         assert_nothing_raised {
             client.getconfig
             client.apply
         }
+        assert(client.fresh?, "Client is not up to date")
 
         assert(FileTest.exists?(file2), "Second file %s does not exist" % file2)
     end
 
 end
 
-# $Id: master.rb 751 2005-11-22 05:54:25Z luke $
+# $Id: master.rb 845 2006-01-18 21:30:56Z luke $
 

data/test/server/server.rb

@@ -13,7 +13,7 @@ require 'xmlrpc/client'
 require 'test/unit'
 require 'puppettest.rb'
 
-# $Id: server.rb 747 2005-11-22 03:54:30Z luke $
+# $Id: server.rb 816 2006-01-12 21:04:06Z luke $
 
 if ARGV.length > 0 and ARGV[0] == "short"
     $short = true
@@ -23,10 +23,6 @@ end
 
 class TestServer < Test::Unit::TestCase
 	include ServerTest
-    def teardown
-        super
-        #print "\n\n\n\n" if Puppet[:debug]
-    end
 
     # test that we can connect to the server
     # we have to use fork here, because we apparently can't use threads
@@ -120,9 +116,8 @@ class TestServer < Test::Unit::TestCase
         assert_nothing_raised() {
             retval = client.getconfig
         }
-        assert_instance_of(Puppet::TransBucket, retval,
-            "Server returned something other than a TransBucket")
 
+        # Try it again, just for kicks
         assert_nothing_raised() {
             retval = client.getconfig
         }

data/test/types/basic.rb

@@ -19,10 +19,8 @@ class TestBasic < Test::Unit::TestCase
         @configfile = nil
         @sleeper = nil
 
-        Puppet[:loglevel] = :debug if __FILE__ == $0
-
         assert_nothing_raised() {
-            @component = Puppet::Type::Component.create(
+            @component = Puppet.type(:component).create(
                 :name => "yaytest",
                 :type => "testing"
             )
@@ -31,14 +29,14 @@ class TestBasic < Test::Unit::TestCase
         assert_nothing_raised() {
             @filepath = tempfile()
             @@tmpfiles << @filepath
-            @configfile = Puppet::Type::PFile.create(
+            @configfile = Puppet.type(:file).create(
                 :path => @filepath,
-                :create => true,
+                :ensure => "file",
                 :checksum => "md5"
             )
         }
         assert_nothing_raised() {
-            @sleeper = Puppet::Type::Service.create(
+            @sleeper = Puppet.type(:service).create(
                 :name => "sleeper",
                 :type => "init",
                 :path => File.join($puppetbase,"examples/root/etc/init.d"),
@@ -116,4 +114,4 @@ class TestBasic < Test::Unit::TestCase
     end
 end
 
-# $Id: basic.rb 737 2005-10-30 04:07:52Z luke $
+# $Id: basic.rb 873 2006-02-07 23:12:33Z luke $

data/test/types/component.rb

@@ -8,7 +8,7 @@ require 'puppet'
 require 'puppettest'
 require 'test/unit'
 
-# $Id: component.rb 742 2005-11-16 17:12:11Z luke $
+# $Id: component.rb 808 2006-01-12 05:02:51Z luke $
 
 class TestComponent < Test::Unit::TestCase
 	include TestPuppet
@@ -22,7 +22,7 @@ class TestComponent < Test::Unit::TestCase
         looped = 0
         loop do
             looped += 1
-            if looped > 1000
+            if looped > 2000
                 raise "Reached limit of looping"
                 break
             end
@@ -40,9 +40,9 @@ class TestComponent < Test::Unit::TestCase
         unless num
             num = randnum(1000)
         end
-        name = "/tmp/componentrandfile" + num.to_s
+        name = tempfile() + num.to_s
 
-        file = Puppet::Type::PFile.create(
+        file = Puppet.type(:file).create(
             :path => name,
             :checksum => "md5"
         )
@@ -51,7 +51,7 @@ class TestComponent < Test::Unit::TestCase
     end
 
     def mkcomp
-        Puppet::Type::Component.create(:name => "component_" + randnum(1000).to_s)
+        Puppet.type(:component).create(:name => "component_" + randnum(1000).to_s)
     end
 
     def mkrandcomp(numfiles, numdivs)
@@ -89,6 +89,7 @@ class TestComponent < Test::Unit::TestCase
             comp.push obj
         }
 
+        Puppet::Type.finalize
         comp
     end
 
@@ -107,19 +108,19 @@ class TestComponent < Test::Unit::TestCase
     end
 
     def test_correctsorting
-        tmpfile = "/tmp/comptesting"
+        tmpfile = tempfile()
         @@tmpfiles.push tmpfile
         trans = nil
         cmd = nil
         File.open(tmpfile, File::WRONLY|File::CREAT|File::TRUNC) { |of|
             of.puts rand(100)
         }
-        file = Puppet::Type::PFile.create(
+        file = Puppet.type(:file).create(
             :path => tmpfile,
             :checksum => "md5"
         )
         assert_nothing_raised {
-            cmd = Puppet::Type::Exec.create(
+            cmd = Puppet.type(:exec).create(
                 :command => "pwd",
                 :path => "/usr/bin:/bin:/usr/sbin:/sbin",
                 :subscribe => [[file.class.name,file.name]],
@@ -129,7 +130,7 @@ class TestComponent < Test::Unit::TestCase
 
         order = nil
         assert_nothing_raised {
-            order = Puppet::Type::Component.sort([file, cmd])
+            order = Puppet.type(:component).sort([file, cmd])
         }
 
         [cmd, file].each { |obj|
@@ -138,19 +139,19 @@ class TestComponent < Test::Unit::TestCase
     end
 
     def test_correctflattening
-        tmpfile = "/tmp/comptesting"
+        tmpfile = tempfile()
         @@tmpfiles.push tmpfile
         trans = nil
         cmd = nil
         File.open(tmpfile, File::WRONLY|File::CREAT|File::TRUNC) { |of|
             of.puts rand(100)
         }
-        file = Puppet::Type::PFile.create(
+        file = Puppet.type(:file).create(
             :path => tmpfile,
             :checksum => "md5"
         )
         assert_nothing_raised {
-            cmd = Puppet::Type::Exec.create(
+            cmd = Puppet.type(:exec).create(
                 :command => "pwd",
                 :path => "/usr/bin:/bin:/usr/sbin:/sbin",
                 :subscribe => [[file.class.name,file.name]],
@@ -158,7 +159,8 @@ class TestComponent < Test::Unit::TestCase
             )
         }
 
-        comp = Puppet::Type::Component.create(:name => "RefreshTest")
+        Puppet::Type.finalize
+        comp = Puppet.type(:component).create(:name => "RefreshTest")
         [cmd, file].each { |obj|
             comp.push obj
         }
@@ -183,12 +185,12 @@ class TestComponent < Test::Unit::TestCase
         File.open(tmpfile, File::WRONLY|File::CREAT|File::TRUNC) { |of|
             of.puts rand(100)
         }
-        file = Puppet::Type::PFile.create(
+        file = Puppet.type(:file).create(
             :path => tmpfile,
             :checksum => "md5"
         )
         assert_nothing_raised {
-            cmd = Puppet::Type::Exec.create(
+            cmd = Puppet.type(:exec).create(
                 :command => "pwd",
                 :path => "/usr/bin:/bin:/usr/sbin:/sbin",
                 :refreshonly => true
@@ -202,6 +204,7 @@ class TestComponent < Test::Unit::TestCase
         ecomp[:subscribe] = [[fcomp.class.name,fcomp.name]]
 
         comp = newcomp("bflatten", ecomp, fcomp)
+        Puppet::Type.finalize
         objects = nil
         assert_nothing_raised {
             objects = comp.flatten
@@ -224,12 +227,12 @@ class TestComponent < Test::Unit::TestCase
         File.open(tmpfile, File::WRONLY|File::CREAT|File::TRUNC) { |of|
             of.puts rand(100)
         }
-        file = Puppet::Type::PFile.create(
+        file = Puppet.type(:file).create(
             :path => tmpfile,
             :checksum => "md5"
         )
         assert_nothing_raised {
-            cmd = Puppet::Type::Exec.create(
+            cmd = Puppet.type(:exec).create(
                 :command => "pwd",
                 :path => "/usr/bin:/bin:/usr/sbin:/sbin",
                 :refreshonly => true
@@ -238,7 +241,7 @@ class TestComponent < Test::Unit::TestCase
 
         ocmd = nil
         assert_nothing_raised {
-            ocmd = Puppet::Type::Exec.create(
+            ocmd = Puppet.type(:exec).create(
                 :command => "echo true",
                 :path => "/usr/bin:/bin:/usr/sbin:/sbin",
                 :refreshonly => true
@@ -254,6 +257,7 @@ class TestComponent < Test::Unit::TestCase
         ocmd[:subscribe] = [[cmd.class.name,cmd.name]]
 
         comp = newcomp("bflatten", ocomp, ecomp, fcomp)
+        Puppet::Type.finalize
         objects = nil
         assert_nothing_raised {
             objects = comp.flatten