puppet 0.9.2 → 0.13.0

data/test/types/filebucket.rb

@@ -9,7 +9,7 @@ require 'test/unit'
 require 'fileutils'
 require 'puppettest'
 
-# $Id: filebucket.rb 724 2005-10-22 22:27:20Z luke $
+# $Id: filebucket.rb 847 2006-01-23 22:38:39Z luke $
 
 class TestFileBucket < Test::Unit::TestCase
 	include FileTesting
@@ -19,7 +19,7 @@ class TestFileBucket < Test::Unit::TestCase
     def mkfile(hash)
         file = nil
         assert_nothing_raised {
-            file = Puppet::Type::PFile.create(hash)
+            file = Puppet.type(:file).create(hash)
         }
         return file
     end
@@ -27,7 +27,7 @@ class TestFileBucket < Test::Unit::TestCase
     def mkbucket(name,path)
         bucket = nil
         assert_nothing_raised {
-            bucket = Puppet::Type::PFileBucket.create(
+            bucket = Puppet.type(:filebucket).create(
                 :name => name,
                 :path => path
             )
@@ -52,15 +52,10 @@ class TestFileBucket < Test::Unit::TestCase
         begin
             initstorage
         rescue
-            system("rm -rf %s" % Puppet[:checksumfile])
+            system("rm -rf %s" % Puppet[:statefile])
         end
     end
 
-    def teardown
-        super
-        clearstorage
-    end
-
     def initstorage
         Puppet::Storage.init
         Puppet::Storage.load
@@ -73,17 +68,17 @@ class TestFileBucket < Test::Unit::TestCase
 
     def test_simplebucket
         name = "yayness"
-        mkbucket("yayness", "/tmp/filebucket")
+        mkbucket(name, tempfile())
 
         bucket = nil
         assert_nothing_raised {
-            bucket = Puppet::Type::PFileBucket.bucket(name)
+            bucket = Puppet.type(:filebucket).bucket(name)
         }
 
         assert_instance_of(Puppet::Client::Dipper, bucket)
 
         md5 = nil
-        newpath = "/tmp/passwd"
+        newpath = tempfile()
         @@tmpfiles << newpath
         system("cp /etc/passwd %s" % newpath)
         assert_nothing_raised {
@@ -94,6 +89,8 @@ class TestFileBucket < Test::Unit::TestCase
 
         newmd5 = nil
 
+        # Just in case the file isn't writable
+        File.chmod(0644, newpath)
         File.open(newpath, "w") { |f| f.puts ";lkjasdf;lkjasdflkjwerlkj134lkj" }
 
         assert_nothing_raised {
@@ -113,11 +110,11 @@ class TestFileBucket < Test::Unit::TestCase
 
     def test_fileswithbuckets
         name = "yayness"
-        mkbucket("yayness", "/tmp/filebucket")
+        mkbucket(name, tempfile())
 
         bucket = nil
         assert_nothing_raised {
-            bucket = Puppet::Type::PFileBucket.bucket(name)
+            bucket = Puppet.type(:filebucket).bucket(name)
         }
 
         file = mktestfile()
@@ -125,7 +122,7 @@ class TestFileBucket < Test::Unit::TestCase
             file[:backup] = ["filebucket", name]
         }
 
-        opath = "/tmp/anotherbuckettest"
+        opath = tempfile()
         @@tmpfiles << opath
         system("cp /etc/passwd %s" % opath)
 
@@ -153,6 +150,7 @@ class TestFileBucket < Test::Unit::TestCase
             File.open(file.name) { |f| newmd5 = Digest::MD5.hexdigest(f.read) }
         )
 
+        #File.chmod(0644, file.name)
         assert_nothing_raised {
             bucket.restore(file.name, origmd5)
         }

data/test/types/fileignoresource.rb

@@ -11,7 +11,6 @@ require 'test/unit'
 require 'fileutils'
 require 'puppettest'
 
-# $Id: $
 
 class TestFileIgnoreSources < Test::Unit::TestCase
 	include FileTesting
@@ -21,15 +20,10 @@ class TestFileIgnoreSources < Test::Unit::TestCase
         begin
             initstorage
         rescue
-            system("rm -rf %s" % Puppet[:checksumfile])
+            system("rm -rf %s" % Puppet[:statefile])
         end
     end
 
-    def teardown
-        super
-        clearstorage
-    end
-
 #This is not needed unless using md5 (correct me if I'm wrong)
     def initstorage
         Puppet::Storage.init
@@ -44,7 +38,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
     def test_ignore_simple_source
 
         #Temp directory to run tests in
-        path = "/tmp/Fileignoresourcetest"
+        path = tempfile()
         @@tmpfiles.push path
 
         #source directory
@@ -77,7 +71,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
 
         #makes Puppet file Object
         assert_nothing_raised {
-            tofile = Puppet::Type::PFile.create(
+            tofile = Puppet.type(:file).create(
                 :name => topath,
                 :source => frompath,
                 :recurse => true,                             
@@ -86,7 +80,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
         }
 
         #make a component and adds the file
-        comp = Puppet::Type::Component.create(
+        comp = Puppet.type(:component).create(
             :name => "component"
         )
         comp.push tofile
@@ -113,7 +107,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
 
     def test_ignore_with_wildcard
         #Temp directory to run tests in
-        path = "/tmp/Fileignoresourcetest"
+        path = tempfile()
         @@tmpfiles.push path
 
         #source directory
@@ -154,7 +148,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
 
         #makes Puppet file Object
         assert_nothing_raised {
-            tofile = Puppet::Type::PFile.create(
+            tofile = Puppet.type(:file).create(
                 :name => topath,
                 :source => frompath,
                 :recurse => true,                             
@@ -163,7 +157,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
         }
 
         #make a component and adds the file
-        comp = Puppet::Type::Component.create(
+        comp = Puppet.type(:component).create(
             :name => "component"
         )
         comp.push tofile
@@ -192,7 +186,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
 
     def test_ignore_array
         #Temp directory to run tests in
-        path = "/tmp/Fileignoresourcetest"
+        path = tempfile()
         @@tmpfiles.push path
 
         #source directory
@@ -238,7 +232,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
 
         #makes Puppet file Object
         assert_nothing_raised {
-            tofile = Puppet::Type::PFile.create(
+            tofile = Puppet.type(:file).create(
                 :name => topath,
                 :source => frompath,
                 :recurse => true,
@@ -248,7 +242,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
         }
 
         #make a component and adds the file
-        comp = Puppet::Type::Component.create(
+        comp = Puppet.type(:component).create(
             :name => "component"
         )
         comp.push tofile
@@ -285,3 +279,5 @@ class TestFileIgnoreSources < Test::Unit::TestCase
     end
 
 end
+
+# $Id$

data/test/types/filesources.rb

@@ -18,7 +18,7 @@ class TestFileSources < Test::Unit::TestCase
         begin
             initstorage
         rescue
-            system("rm -rf %s" % Puppet[:checksumfile])
+            system("rm -rf %s" % Puppet[:statefile])
         end
         if defined? @port
             @port += 1
@@ -27,11 +27,6 @@ class TestFileSources < Test::Unit::TestCase
         end
     end
 
-    def teardown
-        super
-        clearstorage
-    end
-
     def initstorage
         Puppet::Storage.init
         Puppet::Storage.load
@@ -43,7 +38,7 @@ class TestFileSources < Test::Unit::TestCase
     end
 
     def test_newchild
-        path = "/tmp/newchilddir"
+        path = tempfile()
         @@tmpfiles.push path
 
         FileUtils.mkdir_p path
@@ -54,22 +49,22 @@ class TestFileSources < Test::Unit::TestCase
         comp = nil
         trans = nil
         assert_nothing_raised {
-            file = Puppet::Type::PFile.create(
+            file = Puppet.type(:file).create(
                 :name => path
             )
         }
         child = nil
         assert_nothing_raised {
-            child = file.newchild("childtest")
+            child = file.newchild("childtest", true)
         }
         assert(child)
         assert_raise(Puppet::DevError) {
-            file.newchild(File.join(path,"childtest"))
+            file.newchild(File.join(path,"childtest"), true)
         }
     end
 
     def test_simplelocalsource
-        path = "/tmp/Filesourcetest"
+        path = tempfile()
         @@tmpfiles.push path
         FileUtils.mkdir_p path
         frompath = File.join(path,"source")
@@ -82,12 +77,12 @@ class TestFileSources < Test::Unit::TestCase
             of.puts "yayness"
         }
         assert_nothing_raised {
-            tofile = Puppet::Type::PFile.create(
+            tofile = Puppet.type(:file).create(
                 :name => topath,
                 :source => frompath
             )
         }
-        comp = Puppet::Type::Component.create(
+        comp = Puppet.type(:component).create(
             :name => "component"
         )
         comp.push tofile
@@ -97,9 +92,6 @@ class TestFileSources < Test::Unit::TestCase
         assert_nothing_raised {
             trans.evaluate
         }
-   #     assert_nothing_raised {
-   #         comp.sync
-   #     }
 
         assert(FileTest.exists?(topath))
         from = File.open(frompath) { |o| o.read }
@@ -115,30 +107,21 @@ class TestFileSources < Test::Unit::TestCase
         trans = nil
 
         assert_nothing_raised {
-            tofile = Puppet::Type::PFile.create(
+            tofile = Puppet.type(:file).create(
                 :name => todir,
                 "recurse" => true,
                 "backup" => false,
                 "source" => fromdir
             )
         }
-        comp = Puppet::Type::Component.create(
-            :name => "component"
-        )
-        comp.push tofile
-        assert_nothing_raised {
-            trans = comp.evaluate
-        }
-        assert_nothing_raised {
-            trans.evaluate
-        }
+        assert_apply(tofile)
 
-        assert(FileTest.exists?(todir))
+        assert(FileTest.exists?(todir), "Created dir %s does not exist" % todir)
         Puppet::Type.allclear
     end
 
     def run_complex_sources(networked = false)
-        path = "/tmp/ComplexSourcesTest"
+        path = tempfile()
         @@tmpfiles.push path
 
         # first create the source directory
@@ -236,7 +219,7 @@ class TestFileSources < Test::Unit::TestCase
     end
 
     def test_RecursionWithAddedFiles
-        basedir = "/tmp/recursionplussaddedfiles"
+        basedir = tempfile()
         Dir.mkdir(basedir)
         @@tmpfiles << basedir
         file1 = File.join(basedir, "file1")
@@ -246,7 +229,7 @@ class TestFileSources < Test::Unit::TestCase
         File.open(file1, "w") { |f| 3.times { f.print rand(100) } }
         rootobj = nil
         assert_nothing_raised {
-            rootobj = Puppet::Type::PFile.create(
+            rootobj = Puppet.type(:file).create(
                 :name => basedir,
                 :recurse => true,
                 :check => %w{type owner}
@@ -255,7 +238,7 @@ class TestFileSources < Test::Unit::TestCase
             rootobj.evaluate
         }
 
-        klass = Puppet::Type::PFile
+        klass = Puppet.type(:file)
         assert(klass[basedir])
         assert(klass[file1])
         assert_nil(klass[file2])
@@ -277,7 +260,7 @@ class TestFileSources < Test::Unit::TestCase
     end
 
     def mkfileserverconf(mounts)
-        file = "/tmp/fileserverconftestingfile%s" % rand(100)
+        file = tempfile()
         File.open(file, "w") { |f|
             mounts.each { |path, name|
                 f.puts "[#{name}]\n\tpath #{path}\n\tallow *\n"
@@ -293,7 +276,7 @@ class TestFileSources < Test::Unit::TestCase
     # the certificates correct
     def disabled_test_SimpleNetworkSources
         server = nil
-        basedir = "/tmp/simplenetworksourcetesting"
+        basedir = tempfile()
         @@tmpfiles << basedir
 
         mounts = {
@@ -307,8 +290,8 @@ class TestFileSources < Test::Unit::TestCase
         end
         Dir.mkdir(basedir)
 
-        Puppet[:puppetconf] = basedir
-        Puppet[:puppetvar] = basedir
+        Puppet[:confdir] = basedir
+        Puppet[:vardir] = basedir
         Puppet[:autosign] = true
 
         tmpname = "yaytesting"
@@ -375,11 +358,8 @@ class TestFileSources < Test::Unit::TestCase
 
     def test_NetworkSources
         server = nil
-        basedir = "/tmp/networksourcetesting"
+        basedir = tempfile()
         @@tmpfiles << basedir
-        if File.exists?(basedir)
-            system("rm -rf %s" % basedir)
-        end
         Dir.mkdir(basedir)
 
         mounts = {
@@ -388,8 +368,8 @@ class TestFileSources < Test::Unit::TestCase
 
         fileserverconf = mkfileserverconf(mounts)
 
-        Puppet[:puppetconf] = basedir
-        Puppet[:puppetvar] = basedir
+        Puppet[:confdir] = basedir
+        Puppet[:vardir] = basedir
         Puppet[:autosign] = true
 
         Puppet[:masterport] = 8762
@@ -454,7 +434,7 @@ class TestFileSources < Test::Unit::TestCase
         sleep(1)
 
         name = File.join(tmpdir(), "nosourcefile")
-        file = Puppet::Type::PFile.create(
+        file = Puppet.type(:file).create(
             :source => "puppet://localhost/dist/file",
             :name => name
         )
@@ -510,7 +490,7 @@ class TestFileSources < Test::Unit::TestCase
         sleep(1)
 
         name = File.join(tmpdir(), "nosourcefile")
-        file = Puppet::Type::PFile.create(
+        file = Puppet.type(:file).create(
             :source => "puppet://localhost/noexist/file",
             :name => name
         )
@@ -540,7 +520,7 @@ class TestFileSources < Test::Unit::TestCase
         # Now the files should be exactly the same, so we should not see attempts
         # at copying
         assert_nothing_raised {
-            file = Puppet::Type::PFile.create(
+            file = Puppet.type(:file).create(
                 :path => to,
                 :source => from
             )
@@ -566,14 +546,14 @@ class TestFileSources < Test::Unit::TestCase
 
         file = nil
         assert_nothing_raised {
-            file = Puppet::Type::PFile.create(
+            file = Puppet.type(:file).create(
                 :name => to,
                 :source => files
             )
         }
 
         comp = newcomp(file)
-        assert_events(comp, [:file_changed])
+        assert_events([:file_created], comp)
 
         assert(File.exists?(to), "File does not exist")
 
@@ -582,6 +562,51 @@ class TestFileSources < Test::Unit::TestCase
 
         assert_equal("yee-haw", txt, "Contents do not match")
     end
+
+    # Make sure that source-copying updates the checksum on the same run
+    def test_checksumchange
+        source = tempfile()
+        dest = tempfile()
+        File.open(dest, "w") { |f| f.puts "boo" }
+        File.open(source, "w") { |f| f.puts "yay" }
+
+        file = nil
+        assert_nothing_raised {
+            file = Puppet.type(:file).create(
+                :name => dest,
+                :source => source
+            )
+        }
+
+        file.retrieve
+
+        assert_events([:file_changed], file)
+        file.retrieve
+        assert_events([], file)
+    end
+
+    # Make sure that source-copying updates the checksum on the same run
+    def test_sourcebeatsensure
+        source = tempfile()
+        dest = tempfile()
+        File.open(source, "w") { |f| f.puts "yay" }
+
+        file = nil
+        assert_nothing_raised {
+            file = Puppet.type(:file).create(
+                :name => dest,
+                :ensure => "file",
+                :source => source
+            )
+        }
+
+        file.retrieve
+
+        assert_events([:file_created], file)
+        file.retrieve
+        assert_events([], file)
+        assert_events([], file)
+    end
 end
 
-# $Id: filesources.rb 745 2005-11-16 22:17:29Z luke $
+# $Id: filesources.rb 884 2006-02-08 17:11:54Z luke $