puppet 0.9.2 → 0.13.0

data/test/types/filetype.rb

@@ -5,21 +5,18 @@ if __FILE__ == $0
 end
 
 require 'puppet'
-require 'puppet/type/typegen/filetype'
-require 'puppet/type/typegen/filerecord'
+#require 'puppet/type/typegen/filetype'
+#require 'puppet/type/typegen/filerecord'
 require 'test/unit'
 
-# $Id: filetype.rb 724 2005-10-22 22:27:20Z luke $
-
 #class TestFileType < Test::Unit::TestCase
 class TestFileType
     def disabled_setup
-        Puppet[:loglevel] = :debug if __FILE__ == $0
 
-        @passwdtype = Puppet::Type::FileType["passwd"]
+        @passwdtype = Puppet.type(:filetype)["passwd"]
         if @passwdtype.nil?
             assert_nothing_raised() {
-                @passwdtype = Puppet::Type::FileType.createtype(
+                @passwdtype = Puppet.type(:filetype).createtype(
                     :name => "passwd"
                 )
                 @passwdtype.addrecord(
@@ -30,10 +27,10 @@ class TestFileType
             }
         end
 
-        @syslogtype = Puppet::Type::FileType["syslog"]
+        @syslogtype = Puppet.type(:filetype)["syslog"]
         if @syslogtype.nil?
             assert_nothing_raised() {
-                @syslogtype = Puppet::Type::FileType.createtype(
+                @syslogtype = Puppet.type(:filetype).createtype(
                     :escapednewlines => true,
                     :name => "syslog"
                 )
@@ -89,9 +86,10 @@ class TestFileType
     def disabled_test_passwd2_change
         file = nil
         type = nil
-        Kernel.system("cp /etc/passwd /tmp/oparsepasswd")
+        newfile = tempfile()
+        Kernel.system("cp /etc/passwd #{newfile}")
         assert_nothing_raised() {
-            file = @passwdtype.new("/tmp/oparsepasswd")
+            file = @passwdtype.new(newfile)
         }
         assert_nothing_raised() {
             file.retrieve
@@ -114,7 +112,7 @@ class TestFileType
         assert(!file.insync?)
 
         assert_nothing_raised() {
-            file.sync
+            file.evaluate
         }
 
         assert(file.insync?)
@@ -126,12 +124,10 @@ class TestFileType
         assert(!file.insync?)
 
         assert_nothing_raised() {
-            file.sync
+            file.evaluate
         }
 
         assert(file.insync?)
-
-        Kernel.system("rm /tmp/oparsepasswd")
     end
 
     def disabled_test_syslog_nochange
@@ -160,3 +156,5 @@ class TestFileType
 
     end
 end
+
+# $Id: filetype.rb 873 2006-02-07 23:12:33Z luke $

data/test/types/group.rb

@@ -4,7 +4,7 @@ if __FILE__ == $0
     $puppetbase = "../../../../language/trunk"
 end
 
-# $Id: group.rb 742 2005-11-16 17:12:11Z luke $
+# $Id: group.rb 831 2006-01-16 20:01:20Z luke $
 
 require 'etc'
 require 'puppet/type'
@@ -19,7 +19,7 @@ class TestGroup < Test::Unit::TestCase
     end
 
     def teardown
-        Puppet::Type::Group.clear
+        Puppet.type(:group).clear
         @@tmpgroups.each { |group|
             unless missing?(group)
                 remove(group)
@@ -45,6 +45,8 @@ class TestGroup < Test::Unit::TestCase
         def gid(name)
             %x{nireport / /groups name gid}.split("\n").each { |line|
                 group, id = line.chomp.split(/\s+/)
+                assert(id =~ /^-?\d+$/, "Group id %s for %s is not a number" %
+                    [id, group])
                 if group == name
                     return Integer(id)
                 end
@@ -99,7 +101,7 @@ class TestGroup < Test::Unit::TestCase
 
         group[:gid] = old
 
-        trans = assert_events(comp, [], "group")
+        trans = assert_events([], comp, "group")
 
         newgid = old
         while true
@@ -120,7 +122,7 @@ class TestGroup < Test::Unit::TestCase
             group[:gid] = newgid
         }
 
-        trans = assert_events(comp, [:group_modified], "group")
+        trans = assert_events([:group_modified], comp, "group")
 
         curgid = nil
         assert_nothing_raised {
@@ -144,7 +146,7 @@ class TestGroup < Test::Unit::TestCase
 
         assert(obj, "Could not retrieve test group object")
 
-        Puppet::Type::Group.validstates.each { |name, state|
+        Puppet.type(:group).validstates.each { |name, state|
             assert_nothing_raised {
                 method = state.infomethod
                 assert(method, "State %s has no infomethod" % name)
@@ -170,7 +172,7 @@ class TestGroup < Test::Unit::TestCase
             gobj = nil
             comp = nil
             assert_nothing_raised {
-                gobj = Puppet::Type::Group.create(
+                gobj = Puppet.type(:group).create(
                     :name => group,
                     :check => [:gid]
                 )
@@ -198,8 +200,8 @@ class TestGroup < Test::Unit::TestCase
         }
         user = nil
         assert_nothing_raised {
-            checks = Puppet::Type::Group.validstates
-            user = Puppet::Type::Group.create(
+            checks = Puppet.type(:group).validstates
+            user = Puppet.type(:group).create(
                 :name => name,
                 :check => checks
             )
@@ -218,7 +220,7 @@ class TestGroup < Test::Unit::TestCase
             comp = nil
             name = "pptestgr"
 
-            os = Facter["operatingsystem"].value
+            #os = Facter["operatingsystem"].value
 
             #if os == "Darwin"
             #    obj = nil
@@ -234,7 +236,7 @@ class TestGroup < Test::Unit::TestCase
             assert(missing?(name), "Group %s is still present" % name)
 
             assert_nothing_raised {
-                gobj = Puppet::Type::Group.create(
+                gobj = Puppet.type(:group).create(
                     :name => name
                 )
 
@@ -242,7 +244,7 @@ class TestGroup < Test::Unit::TestCase
             }
 
             @@tmpgroups << name
-            trans = assert_events(comp, [:group_created], "group")
+            trans = assert_events([:group_created], comp, "group")
 
             obj = nil
             assert_nothing_raised {
@@ -250,7 +252,7 @@ class TestGroup < Test::Unit::TestCase
             }
             assert(!missing?(name), "Group %s is missing" % name)
 
-            tests = Puppet::Type::Group.validstates
+            tests = Puppet.type(:group).validstates
 
             gobj.retrieve
             tests.each { |test|
@@ -261,7 +263,7 @@ class TestGroup < Test::Unit::TestCase
                 end
             }
 
-            assert_rollback_events(trans, [:group_deleted], "group")
+            assert_rollback_events(trans, [:group_removed], "group")
 
             assert(missing?(name), "Group %s is still present" % name)
         end

data/test/types/host.rb

@@ -0,0 +1,146 @@
+# Test host job creation, modification, and destruction
+
+if __FILE__ == $0
+    $:.unshift '..'
+    $:.unshift '../../lib'
+    $puppetbase = "../.."
+end
+
+require 'puppettest'
+require 'puppet'
+require 'test/unit'
+require 'facter'
+
+class TestHost < Test::Unit::TestCase
+	include TestPuppet
+    def setup
+        super
+        # god i'm lazy
+        @hosttype = Puppet.type(:host)
+        @oldhosttype = @hosttype.filetype
+    end
+
+    def teardown
+        @hosttype.filetype = @oldhosttype
+        Puppet.type(:file).clear
+        super
+    end
+
+    # Here we just create a fake host type that answers to all of the methods
+    # but does not modify our actual system.
+    def mkfaketype
+        @hosttype.filetype = Puppet::FileType.filetype(:ram)
+    end
+
+    def mkhost
+        host = nil
+        assert_nothing_raised {
+            host = Puppet.type(:host).create(
+                :name => "culain",
+                :ip => "192.168.0.3",
+                :alias => "puppet"
+            )
+        }
+
+        return host
+    end
+
+    def test_simplehost
+        mkfaketype
+        host = nil
+        assert_nothing_raised {
+            assert_nil(Puppet.type(:host).retrieve)
+        }
+
+        assert_nothing_raised {
+            host = Puppet.type(:host).create(
+                :name => "culain",
+                :ip => "192.168.0.3"
+            )
+        }
+
+        assert_nothing_raised {
+            Puppet.type(:host).store
+        }
+
+        assert_nothing_raised {
+            assert(
+                Puppet.type(:host).to_file.include?(
+                    Puppet.type(:host).fileobj.read
+                ),
+                "File does not include all of our objects"
+            )
+        }
+    end
+
+    def test_hostsparse
+        fakedata("data/types/hosts").each { |file|
+            @hosttype.path = file
+            Puppet.info "Parsing %s" % file
+            assert_nothing_raised {
+                Puppet.type(:host).retrieve
+            }
+
+            @hosttype.clear
+        }
+    end
+
+    def test_moddinghost
+        mkfaketype
+        host = mkhost()
+
+        assert_events([:host_created], host)
+
+        host.retrieve
+
+        # This was a hard bug to track down.
+        assert_instance_of(String, host.is(:ip))
+
+        host[:alias] = %w{madstop kirby yayness}
+
+        assert_events([:host_changed], host)
+    end
+
+    def test_aliasisstate
+        assert_equal(:state, @hosttype.attrtype(:alias))
+    end
+
+    def test_multivalues
+        host = mkhost
+        assert_raise(Puppet::Error) {
+            host[:alias] = "puppetmasterd yayness"
+        }
+    end
+
+    def test_puppetalias
+        host = mkhost()
+
+        assert_nothing_raised {
+            host[:alias] = "testing"
+        }
+
+        same = host.class["testing"]
+        assert(same, "Could not retrieve by alias")
+    end
+
+    def test_removal
+        mkfaketype
+        host = mkhost()
+        assert_nothing_raised {
+            host[:ensure] = :present
+        }
+        assert_events([:host_created], host)
+
+        host.retrieve
+        assert(host.insync?)
+        assert_nothing_raised {
+            host[:ensure] = :absent
+        }
+
+        assert_events([:host_removed], host)
+        host.retrieve
+        assert_events([], host)
+    end
+end
+
+# $Id: host.rb 831 2006-01-16 20:01:20Z luke $

data/test/types/package.rb

@@ -11,19 +11,19 @@ require 'facter'
 
 $platform = Facter["operatingsystem"].value
 
-unless Puppet::Type::Package.default
+unless Puppet.type(:package).default
     puts "No default package type for %s; skipping package tests" % $platform
 else
 
 class TestPackageSource < Test::Unit::TestCase
 	include TestPuppet
     def test_filesource
-        system("touch /tmp/fakepackage")
+        path = tempfile()
+        system("touch %s" % path)
         assert_equal(
-            "/tmp/fakepackage",
-            Puppet::PackageSource.get("file:///tmp/fakepackage")
+            path,
+            Puppet::PackageSource.get("file://#{path}")
         )
-        system("rm -f /tmp/fakepackage")
     end
 end
 
@@ -31,8 +31,8 @@ class TestPackages < Test::Unit::TestCase
 	include FileTesting
     def setup
         super
-        #@list = Puppet::Type::Package.getpkglist
-        Puppet::Type::Package.clear
+        #@list = Puppet.type(:package).getpkglist
+        Puppet.type(:package).clear
     end
 
     # These are packages that we're sure will be installed
@@ -41,15 +41,9 @@ class TestPackages < Test::Unit::TestCase
         case $platform
         when "SunOS"
             pkgs = %w{SMCossh}
-        when "Linux"
-            case Facter["distro"].value
-            when "Debian": pkgs = %w{ssh openssl}
-            when "Fedora": pkgs = %w{openssh}
-            #when "RedHat": type = :rpm
-            else
-                Puppet.notice "No test package for %s" % $platform 
-                return []
-            end
+        when "Debian": pkgs = %w{ssh openssl}
+        when "Fedora": pkgs = %w{openssh}
+        when "OpenBSD": pkgs = %{vim}
         else
             Puppet.notice "No test package for %s" % $platform
             return []
@@ -58,30 +52,53 @@ class TestPackages < Test::Unit::TestCase
         return pkgs
     end
 
-    def tstpkg
-        case $platform
-        #when "SunOS"
-        #    type = "sunpkg"
-        when "Linux"
-            case Facter["distro"].value
-            when "Debian":
-                return %w{zec}
-            #when "RedHat": type = :rpm
-            when "Fedora":
-                return %w{wv}
+    def mkpkgs
+        tstpkgs().each { |pkg|
+            if pkg.is_a?(Array)
+                hash = {:name => pkg[0], :source => pkg[1]}
+                hash[:ensure] = "present"
+
+                unless File.exists?(hash[:source])
+                    Puppet.info "No package file %s for %s; skipping some package tests" %
+                        [hash[:source], Facter["operatingsystem"].value]
+                end
+                yield Puppet.type(:package).create(hash)
             else
-                Puppet.notice "No test packags for %s" % $platform
-                return nil
+                yield Puppet.type(:package).create(
+                    :name => pkg, :ensure => "latest"
+                )
+            end
+        }
+    end
+
+    def tstpkgs
+        retval = []
+        case $platform
+        when "Solaris":
+            arch = Facter["hardwareisa"].value + Facter["operatingsystemrelease"].value
+            case arch
+            when "sparc5.8":
+                retval = [["SMCarc", "/usr/local/pkg/arc-5.21e-sol8-sparc-local"]]
+            when "i3865.8":
+                retval = [["SMCarc", "/usr/local/pkg/arc-5.21e-sol8-intel-local"]]
             end
+        when "OpenBSD":
+            retval = [["aalib", "ftp://ftp.usa.openbsd.org/pub/OpenBSD/3.8/packages/i386/aalib-1.2-no_x11.tgz"]]
+        when "Debian":
+            retval = %w{zec}
+        #when "RedHat": type = :rpm
+        when "Fedora":
+            retval = %w{wv}
         else
-            Puppet.notice "No test packags for %s" % $platform
-            return nil
+            Puppet.notice "No test packages for %s" % $platform
         end
+
+        return retval
     end
 
     def mkpkgcomp(pkg)
         assert_nothing_raised {
-            pkg = Puppet::Type::Package.create(:name => pkg, :install => true)
+            pkg = Puppet.type(:package).create(:name => pkg, :ensure => "present")
         }
         assert_nothing_raised {
             pkg.retrieve
@@ -96,7 +113,7 @@ class TestPackages < Test::Unit::TestCase
         installedpkgs().each { |pkg|
             obj = nil
             assert_nothing_raised {
-                obj = Puppet::Type::Package.create(
+                obj = Puppet.type(:package).create(
                     :name => pkg
                 )
             }
@@ -107,14 +124,14 @@ class TestPackages < Test::Unit::TestCase
                 obj.retrieve
             }
 
-            assert(obj.is(:install), "Could not retrieve package version")
+            assert(obj[:version], "Could not retrieve package version")
         }
     end
 
     def test_nosuchpkg
         obj = nil
         assert_nothing_raised {
-            obj = Puppet::Type::Package.create(
+            obj = Puppet.type(:package).create(
                 :name => "thispackagedoesnotexist"
             )
         }
@@ -123,15 +140,12 @@ class TestPackages < Test::Unit::TestCase
             obj.retrieve
         }
 
-        assert_equal(:notinstalled, obj.is(:install),
+        assert_equal(:absent, obj.is(:ensure),
             "Somehow retrieved unknown pkg's version")
     end
 
     def test_latestpkg
-        pkgs = tstpkg || return
-
-        pkgs.each { |name|
-            pkg = Puppet::Type::Package.create(:name => name)
+        tstpkgs { |pkg|
             assert_nothing_raised {
                 assert(pkg.latest, "Package did not return value for 'latest'")
             }
@@ -142,13 +156,9 @@ class TestPackages < Test::Unit::TestCase
         $stderr.puts "Run as root to perform package installation tests"
     else
     def test_installpkg
-        pkgs = tstpkg || return
-        pkgs.each { |pkg|
+        mkpkgs { |pkg|
             # we first set install to 'true', and make sure something gets
             # installed
-            assert_nothing_raised {
-                pkg = Puppet::Type::Package.create(:name => pkg, :install => true)
-            }
             assert_nothing_raised {
                 pkg.retrieve
             }
@@ -160,46 +170,47 @@ class TestPackages < Test::Unit::TestCase
 
             comp = newcomp("package", pkg)
 
-            assert_events(comp, [:package_installed], "package")
+            assert_events([:package_created], comp, "package")
 
             # then uninstall it
             assert_nothing_raised {
-                pkg[:install] = false
+                pkg[:ensure] = "absent"
             }
 
 
             pkg.retrieve
 
-            assert(! pkg.insync?, "Package is insync")
+            assert(! pkg.insync?, "Package is in sync")
 
-            assert_events(comp, [:package_removed], "package")
+            assert_events([:package_removed], comp, "package")
 
             # and now set install to 'latest' and verify it installs
             # FIXME this isn't really a very good test -- we should install
             # a low version, and then upgrade using this.  But, eh.
-            assert_nothing_raised {
-                pkg[:install] = "latest"
-            }
+            if pkg.respond_to?(:latest)
+                assert_nothing_raised {
+                    pkg[:ensure] = "latest"
+                }
 
-            assert_events(comp, [:package_installed], "package")
+                assert_events([:package_created], comp, "package")
 
-            pkg.retrieve
-            assert(pkg.insync?, "After install, package is not insync")
-
-            assert_nothing_raised {
-                pkg[:install] = false
-            }
+                pkg.retrieve
+                assert(pkg.insync?, "After install, package is not insync")
 
+                assert_nothing_raised {
+                    pkg[:ensure] = "absent"
+                }
 
-            pkg.retrieve
+                pkg.retrieve
 
-            assert(! pkg.insync?, "Package is insync")
+                assert(! pkg.insync?, "Package is insync")
 
-            assert_events(comp, [:package_removed], "package")
+                assert_events([:package_removed], comp, "package")
+            end
         }
     end
     end
 end
 end
 
-# $Id: package.rb 742 2005-11-16 17:12:11Z luke $
+# $Id: package.rb 836 2006-01-17 22:11:51Z luke $