puppet 0.9.2 → 0.13.0

data/test/other/events.rb

@@ -8,7 +8,7 @@ require 'puppet'
 require 'puppettest'
 require 'test/unit'
 
-# $Id: events.rb 724 2005-10-22 22:27:20Z luke $
+# $Id: events.rb 832 2006-01-17 07:11:50Z luke $
 
 class TestEvents < Test::Unit::TestCase
 	include TestPuppet
@@ -18,41 +18,40 @@ class TestEvents < Test::Unit::TestCase
     end
 
     def test_simplesubscribe
-        file = Puppet::Type::PFile.create(
-            :name => "/tmp/eventtestingA",
-            :create => true
+        name = tempfile()
+        file = Puppet.type(:file).create(
+            :name => name,
+            :ensure => "file"
         )
-        exec = Puppet::Type::Exec.create(
+        exec = Puppet.type(:exec).create(
             :name => "echo true",
             :path => "/usr/bin:/bin",
             :refreshonly => true,
             :subscribe => [[file.class.name, file.name]] 
         )
 
-        @@tmpfiles << "/tmp/eventtestingA"
-
         comp = newcomp("eventtesting", file, exec)
 
-        trans = assert_events(comp, [:file_created], "events")
+        trans = assert_events([:file_created], comp)
 
         assert_equal(1, trans.triggered?(exec, :refresh))
     end
 
     def test_simplerequire
-        file = Puppet::Type::PFile.create(
-            :name => "/tmp/eventtestingA",
-            :create => true
+        name = tempfile()
+        file = Puppet.type(:file).create(
+            :name => name,
+            :ensure => "file"
         )
-        exec = Puppet::Type::Exec.create(
+        exec = Puppet.type(:exec).create(
             :name => "echo true",
             :path => "/usr/bin:/bin",
             :refreshonly => true,
             :require => [[file.class.name, file.name]] 
         )
 
-        @@tmpfiles << "/tmp/eventtestingA"
 
-        comp = Puppet::Type::Component.create(
+        comp = Puppet.type(:component).create(
             :name => "eventtesting"
         )
         comp.push exec
@@ -67,21 +66,21 @@ class TestEvents < Test::Unit::TestCase
         assert_equal(0, trans.triggered?(exec, :refresh))
     end
 
-    def test_zladderrequire
+    def test_ladderrequire
         comps = {}
         objects = {}
-        fname = "/tmp/eventtestfuntest"
+        fname = tempfile()
         [:a, :b].each { |l|
             case l
             when :a
-                name = "/tmp/eventtesting%s" % l
-                objects[l] = Puppet::Type::PFile.create(
+                name = tempfile() + l.to_s
+                objects[l] = Puppet.type(:file).create(
                     :name => name,
-                    :create => true
+                    :ensure => "file"
                 )
                 @@tmpfiles << name
             when :b
-                objects[l] = Puppet::Type::Exec.create(
+                objects[l] = Puppet.type(:exec).create(
                     :name => "touch %s" % fname,
                     :path => "/usr/bin:/bin",
                     :refreshonly => true
@@ -90,7 +89,7 @@ class TestEvents < Test::Unit::TestCase
             end
 
 
-            comps[l] = Puppet::Type::Component.create(
+            comps[l] = Puppet.type(:component).create(
                 :name => "eventtesting%s" % l
             )
 
@@ -99,6 +98,8 @@ class TestEvents < Test::Unit::TestCase
 
         comps[:b][:subscribe] = [[comps[:a].class.name, comps[:a].name]]
 
+        Puppet::Type.finalize
+
         trans = comps[:a].evaluate
         events = nil
         assert_nothing_raised {

data/test/other/log.rb

@@ -9,7 +9,7 @@ require 'puppet'
 require 'puppettest'
 require 'test/unit'
 
-# $Id: log.rb 740 2005-11-01 20:22:19Z luke $
+# $Id: log.rb 873 2006-02-07 23:12:33Z luke $
 
 class TestLog < Test::Unit::TestCase
     include TestPuppet
@@ -44,6 +44,7 @@ class TestLog < Test::Unit::TestCase
     def test_logfile
         fact = nil
         levels = nil
+        Puppet::Log.level = :debug
         levels = getlevels
         logfile = tempfile()
         assert_nothing_raised() {
@@ -77,7 +78,6 @@ class TestLog < Test::Unit::TestCase
     end
 
     def test_consolelog
-        Puppet[:debug] = true if __FILE__ == $0
         fact = nil
         levels = getlevels
         assert_nothing_raised() {
@@ -100,28 +100,28 @@ class TestLog < Test::Unit::TestCase
     end
 
     def test_output
-        Puppet[:debug] = false
+        Puppet.debug = false
         assert(Puppet.err("This is an error").is_a?(Puppet::Log))
         assert(Puppet.debug("This is debugging").nil?)
-        Puppet[:debug] = true
+        Puppet.debug = true
         assert(Puppet.err("This is an error").is_a?(Puppet::Log))
         assert(Puppet.debug("This is debugging").is_a?(Puppet::Log))
     end
 
     def test_creatingdirs
-        Puppet[:logdest] = "/tmp/logtesting/logfile"
+        dir = tempfile()
+        file = File.join(dir, "logfile")
+        Puppet::Log.newdestination file
         Puppet.info "testing logs"
-        assert(FileTest.directory?("/tmp/logtesting"))
-        assert(FileTest.file?("/tmp/logtesting/logfile"))
-
-        system("rm -rf /tmp/logtesting")
+        assert(FileTest.directory?(dir))
+        assert(FileTest.file?(file))
     end
 
     def test_logtags
         path = tempfile
         File.open(path, "w") { |f| f.puts "yayness" }
 
-        file = Puppet::Type::PFile.create(
+        file = Puppet.type(:file).create(
             :path => path,
             :check => [:owner, :group, :mode, :checksum]
         )
@@ -144,7 +144,7 @@ class TestLog < Test::Unit::TestCase
 
     # Verify that we can pass strings that match printf args
     def test_percentlogs
-        Puppet[:logdest] = :syslog
+        Puppet::Log.newdestination :syslog
 
         assert_nothing_raised {
             Puppet::Log.new(
@@ -157,7 +157,7 @@ class TestLog < Test::Unit::TestCase
     # Verify that the error and source are always strings
     def test_argsAreStrings
         msg = nil
-        file = Puppet::Type::PFile.create(
+        file = Puppet.type(:file).create(
             :path => tempfile(),
             :check => %w{owner group}
         )
@@ -175,9 +175,9 @@ class TestLog < Test::Unit::TestCase
     # Verify that loglevel behaves as one expects
     def test_loglevel
         path = tempfile()
-        file = Puppet::Type::PFile.create(
+        file = Puppet.type(:file).create(
             :path => path,
-            :create => true
+            :ensure => "file"
         )
 
         assert_nothing_raised {

data/test/other/metrics.rb

@@ -18,6 +18,7 @@ end
 
 if $haverrd
     class TestMetric < Test::Unit::TestCase
+        include TestPuppet
 
         def gendata
             totalmax = 1000
@@ -25,7 +26,7 @@ if $haverrd
             eventmax = 10
             maxdiff = 10
 
-            types = [Puppet::Type::PFile, Puppet::Type::Package, Puppet::Type::Service]
+            types = [Puppet.type(:file), Puppet.type(:package), Puppet.type(:package)]
             data = [:total, :managed, :outofsync, :changed, :totalchanges]
             events = [:file_changed, :package_installed, :service_started]
 
@@ -52,13 +53,8 @@ if $haverrd
         end
 
         def setup
-            Puppet[:rrddir] = File.join(Puppet[:puppetvar], "rrdtesting")
+            super
             Puppet[:rrdgraph] = true
-            Puppet[:loglevel] = :debug if __FILE__ == $0
-        end
-
-        def teardown
-            system("rm -rf %s" % Puppet[:rrddir])
         end
 
         def test_fakedata
@@ -89,4 +85,4 @@ else
     $stderr.puts "Missing RRD library -- skipping metric tests"
 end
 
-# $Id: metrics.rb 724 2005-10-22 22:27:20Z luke $
+# $Id: metrics.rb 816 2006-01-12 21:04:06Z luke $

data/test/other/overrides.rb

@@ -29,7 +29,7 @@ class TestOverrides < Test::Unit::TestCase
         baseobj = nil
         basefile = File.join(basedir, "file")
         assert_nothing_raised("Could not create base obj") {
-            baseobj = Puppet::Type::PFile.create(
+            baseobj = Puppet.type(:file).create(
                 :path => basedir,
                 :recurse => true,
                 :mode => "755"
@@ -40,7 +40,7 @@ class TestOverrides < Test::Unit::TestCase
         subdir = File.join(basedir, "0")
         subfile = File.join(subdir, "file")
         assert_nothing_raised("Could not create sub obj") {
-            subobj = Puppet::Type::PFile.create(
+            subobj = Puppet.type(:file).create(
                 :path => subdir,
                 :recurse => true,
                 :mode => "644"
@@ -63,7 +63,7 @@ class TestOverrides < Test::Unit::TestCase
 
         baseobj = nil
         assert_nothing_raised("Could not create base obj") {
-            baseobj = Puppet::Type::PFile.create(
+            baseobj = Puppet.type(:file).create(
                 :path => basedir,
                 :recurse => true,
                 :mode => "755"
@@ -87,7 +87,7 @@ class TestOverrides < Test::Unit::TestCase
             end
 
             assert_nothing_raised("Could not create sub obj") {
-                children << Puppet::Type::PFile.create(
+                children << Puppet.type(:file).create(
                     :path => subdir,
                     :recurse => true,
                     :mode => mode
@@ -112,4 +112,4 @@ class TestOverrides < Test::Unit::TestCase
     end
 end
 
-# $Id: overrides.rb 724 2005-10-22 22:27:20Z luke $
+# $Id: overrides.rb 787 2006-01-08 00:02:23Z luke $

data/test/other/relationships.rb

@@ -12,7 +12,7 @@ class TestRelationships < Test::Unit::TestCase
 	include TestPuppet
     def newfile
         assert_nothing_raised() {
-            return Puppet::Type::PFile.create(
+            return Puppet.type(:file).create(
                 :path => tempfile,
                 :check => [:mode, :owner, :group]
             )
@@ -26,6 +26,8 @@ class TestRelationships < Test::Unit::TestCase
             file1[:require] = [file2.class.name, file2.name]
         }
 
+        Puppet::Type.finalize
+
         deps = []
         assert_nothing_raised {
             file1.eachdependency { |obj|
@@ -110,4 +112,4 @@ class TestRelationships < Test::Unit::TestCase
     end
 end
 
-# $Id: relationships.rb 724 2005-10-22 22:27:20Z luke $
+# $Id: relationships.rb 808 2006-01-12 05:02:51Z luke $

data/test/other/storage.rb

@@ -11,12 +11,28 @@ require 'test/unit'
 class TestParsedFile < Test::Unit::TestCase
 	include TestPuppet
 
+    def mkfile
+        path = tempfile()
+        File.open(path, "w") { |f| f.puts :yayness }
+
+        f = Puppet.type(:file).create(
+            :name => path,
+            :check => %w{checksum type}
+        )
+
+        return f
+    end
+
     def test_storeandretrieve
+        path = tempfile()
+
+        f = mkfile()
+
         hash = {:a => :b, :c => :d}
 
         state = nil
         assert_nothing_raised {
-            state = Puppet::Storage.state(hash)
+            state = Puppet::Storage.cache(f)
         }
 
         assert(!state.include?("name"))
@@ -29,11 +45,56 @@ class TestParsedFile < Test::Unit::TestCase
             Puppet::Storage.store
         }
         assert_nothing_raised {
-            state = Puppet::Storage.state(hash)
+            Puppet::Storage.clear
+        }
+        assert_nothing_raised {
+            Puppet::Storage.load
+        }
+
+        # Reset it
+        state = nil
+        assert_nothing_raised {
+            state = Puppet::Storage.cache(f)
         }
 
         assert_equal(state["name"], hash)
     end
+
+    # we're getting corrupt files, probably because multiple processes
+    # are reading or writing the file at once
+    # so we need to test that
+    def test_multiwrite
+        f = mkfile()
+
+        value = {:a => :b}
+        threads = []
+        9.times { |a|
+            threads << Thread.new {
+                9.times { |b|
+                    assert_nothing_raised {
+                        Puppet::Storage.load
+                        state = Puppet::Storage.cache(f)
+                        value.each { |k,v| state[k] = v }
+                        state[:e] = rand(100)
+                        Puppet::Storage.store
+                    }
+                }
+            }
+        }
+        threads.each { |th| th.join }
+    end
+
+    def test_emptyrestore
+        Puppet::Storage.load
+        Puppet::Storage.store
+        Puppet::Storage.clear
+        Puppet::Storage.load
+
+        f = mkfile()
+        state = Puppet::Storage.cache(f)
+        assert_same Hash, state.class
+        assert_equal 0, state.size
+    end
 end
 
-# $Id: storage.rb 742 2005-11-16 17:12:11Z luke $
+# $Id: storage.rb 847 2006-01-23 22:38:39Z luke $

data/test/other/transactions.rb

@@ -8,7 +8,7 @@ require 'puppet'
 require 'puppettest'
 require 'test/unit'
 
-# $Id: transactions.rb 747 2005-11-22 03:54:30Z luke $
+# $Id: transactions.rb 871 2006-02-07 05:58:00Z luke $
 
 class TestTransactions < Test::Unit::TestCase
 	include FileTesting
@@ -34,10 +34,7 @@ class TestTransactions < Test::Unit::TestCase
     end
 
     def teardown
-        Puppet::Type::Service.each { |serv|
-            serv[:running] = false
-            serv.sync
-        }
+        stopservices
         #print "\n\n" if Puppet[:debug]
         super
     end
@@ -66,13 +63,13 @@ class TestTransactions < Test::Unit::TestCase
         @@tmpfiles.push tmpfile
         hash[:name] = tmpfile
         assert_nothing_raised() {
-            return Puppet::Type::PFile.create(hash)
+            return Puppet.type(:file).create(hash)
         }
     end
 
     def newservice
         assert_nothing_raised() {
-            return Puppet::Type::Service.create(
+            return Puppet.type(:service).create(
                 :name => "sleeper",
                 :type => "init",
                 :path => File.join($puppetbase,"examples/root/etc/init.d"),
@@ -84,7 +81,7 @@ class TestTransactions < Test::Unit::TestCase
 
     def newexec(file)
         assert_nothing_raised() {
-            return Puppet::Type::Exec.create(
+            return Puppet.type(:exec).create(
                 :name => "touch %s" % file,
                 :path => "/bin:/usr/bin:/sbin:/usr/sbin",
                 :returns => 0
@@ -126,9 +123,10 @@ class TestTransactions < Test::Unit::TestCase
 
             file[:mode] = "755"
         }
-        trans = assert_events(component, [:inode_changed, :inode_changed], "file")
+        trans = assert_events([:file_changed, :file_changed], component)
+        file.retrieve
 
-        assert_rollback_events(trans, [:inode_changed, :inode_changed], "file")
+        assert_rollback_events(trans, [:file_changed, :file_changed], "file")
 
         assert_nothing_raised() {
             file.retrieve
@@ -141,7 +139,8 @@ class TestTransactions < Test::Unit::TestCase
     end
 
     # start a service, and then roll the modification back
-    def test_servicetrans
+    # Disabled, because it wasn't really worth the effort.
+    def disabled_test_servicetrans
         transaction = nil
         service = newservice()
 
@@ -150,9 +149,13 @@ class TestTransactions < Test::Unit::TestCase
         assert_nothing_raised() {
             service[:running] = 1
         }
-        trans = assert_events(component, [:service_started], "file")
+        service.retrieve
+        assert(service.insync?, "Service did not start")
+        system("ps -ef | grep ruby")
+        trans = assert_events([:service_started], component)
+        service.retrieve
 
-        assert_rollback_events(trans, [:service_stopped], "file")
+        assert_rollback_events(trans, [:service_stopped], "service")
     end
 
     # test that services are correctly restarted and that work is done
@@ -186,8 +189,7 @@ class TestTransactions < Test::Unit::TestCase
             file[:mode] = "755"
         }
 
-        trans = assert_events(component,
-            [:inode_changed], "testboth")
+        trans = assert_events( [:file_changed], component)
 
         assert(FileTest.exists?(execfile), "Execfile does not exist")
         File.unlink(execfile)
@@ -195,8 +197,7 @@ class TestTransactions < Test::Unit::TestCase
             file[:group] = @groups[1]
         }
 
-        trans = assert_events(component,
-            [:inode_changed], "testboth")
+        trans = assert_events([:file_changed], component)
         assert(FileTest.exists?(execfile), "Execfile does not exist")
     end
 
@@ -220,15 +221,14 @@ class TestTransactions < Test::Unit::TestCase
         ecomp[:subscribe] = [[fcomp.class.name,fcomp.name]]
         exec[:refreshonly] = true
 
-        trans = assert_events(component, [], "subscribe1")
+        trans = assert_events([], component)
 
         assert_nothing_raised() {
             file[:group] = @groups[1]
             file[:mode] = "755"
         }
 
-        trans = assert_events(component, [:inode_changed, :inode_changed],
-            "subscribe2")
+        trans = assert_events([:file_changed, :file_changed], component)
 
     end