puppet 0.23.2 → 0.24.0

data/test/ral/types/file.rb

@@ -1,11 +1,13 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'fileutils'
 
 class TestFile < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
     # hmmm
     # this is complicated, because we store references to the created
@@ -104,6 +106,12 @@ class TestFile < Test::Unit::TestCase
         }
     end
 
+    def test_groups_fails_when_invalid
+        assert_raise(Puppet::Error, "did not fail when the group was empty") do
+            Puppet::Type.type(:file).create :path => "/some/file", :group => ""
+        end
+    end
+
     if Puppet::Util::SUIDManager.uid == 0
         def test_createasuser
             dir = tmpdir()
@@ -122,7 +130,7 @@ class TestFile < Test::Unit::TestCase
                 )
             }
 
-            comp = newcomp("createusertest", file)
+            comp = mk_catalog("createusertest", file)
 
             assert_events([:file_created], comp)
         end
@@ -397,6 +405,8 @@ class TestFile < Test::Unit::TestCase
 
                 events = assert_apply(file)
 
+                assert(events)
+
                 assert(! events.include?(:file_changed),
                     "File incorrectly changed")
                 assert_events([], file)
@@ -493,6 +503,7 @@ class TestFile < Test::Unit::TestCase
         # Create a test directory
         path = tempfile()
         dir = @file.create :path => path, :mode => 0755, :recurse => true
+        config = mk_catalog(dir)
         
         Dir.mkdir(path)
         
@@ -673,6 +684,7 @@ class TestFile < Test::Unit::TestCase
                     :check => %w{owner mode group}
                 )
             }
+            config = mk_catalog dir
             
             children = nil
 
@@ -683,19 +695,22 @@ class TestFile < Test::Unit::TestCase
             assert_equal([subdir], children.collect {|c| c.title },
                 "Incorrect generated children")
             
-            dir.class[subdir].remove
+            # Remove our subdir resource, 
+            subdir_resource = config.resource(:file, subdir)
+            config.remove_resource(subdir_resource)
 
+            # Create the test file
             File.open(tmpfile, "w") { |f| f.puts "yayness" }
             
             assert_nothing_raised {
                 children = dir.eval_generate
             }
 
+            # And make sure we get both resources back.
             assert_equal([subdir, tmpfile].sort, children.collect {|c| c.title }.sort,
-                "Incorrect generated children")
+                "Incorrect generated children when recurse == %s" % value.inspect)
             
             File.unlink(tmpfile)
-            #system("rm -rf %s" % basedir)
             Puppet.type(:file).clear
         end
     end
@@ -754,6 +769,7 @@ class TestFile < Test::Unit::TestCase
                 :check => %w{owner mode group}
             )
         }
+        mk_catalog dir
 
         assert_nothing_raised {
             dir.eval_generate
@@ -796,6 +812,7 @@ class TestFile < Test::Unit::TestCase
                 :check => %w{mode owner group}
             )
         }
+        mk_catalog dirobj
 
         assert_nothing_raised {
             dirobj.eval_generate
@@ -884,7 +901,7 @@ class TestFile < Test::Unit::TestCase
             )
         }
 
-        comp = newcomp("yay", file)
+        comp = mk_catalog("yay", file)
         comp.finalize
         assert_apply(comp)
         #assert_events([:directory_created], comp)
@@ -1274,26 +1291,27 @@ class TestFile < Test::Unit::TestCase
         lfobj = Puppet::Type.newfile(
             :title => "localfile",
             :path => localfile,
-            :content => "rahtest"
+            :content => "rahtest",
+            :backup => false
         )
-        
 
         destobj = Puppet::Type.newfile(:title => "destdir", :path => destdir,
                                     :source => sourcedir,
+                                    :backup => false,
                                     :recurse => true)
 
-        comp = newcomp(lfobj, destobj)
-        assert_apply(comp)
+        config = mk_catalog(lfobj, destobj)
+        config.apply
 
         assert(FileTest.exists?(dsourcefile), "File did not get copied")
         assert(FileTest.exists?(localfile), "File did not get created")
         assert(FileTest.exists?(purgee), "File got prematurely purged")
 
         assert_nothing_raised { destobj[:purge] = true }
-        assert_apply(comp)
+        config.apply
 
-        assert(FileTest.exists?(dsourcefile), "Source file got purged")
         assert(FileTest.exists?(localfile), "Local file got purged")
+        assert(FileTest.exists?(dsourcefile), "Source file got purged")
         assert(! FileTest.exists?(purgee), "File did not get purged")
     end
 
@@ -1333,7 +1351,7 @@ class TestFile < Test::Unit::TestCase
             group = Puppet.type(:group).create(
                 :name => "pptestg"
             )
-            comp = newcomp(user, group, home)
+            comp = mk_catalog(user, group, home)
         }
         
         # Now make sure we get a relationship for each of these
@@ -1629,6 +1647,7 @@ class TestFile < Test::Unit::TestCase
         file = File.join(dir, "file")
         File.open(file, "w") { |f| f.puts "" }
         obj = Puppet::Type.newfile :path => dir, :recurse => true, :mode => 0755
+        mk_catalog obj
         
         assert_equal("/%s" % obj.ref, obj.path)
         
@@ -1739,6 +1758,7 @@ class TestFile < Test::Unit::TestCase
         File.open(file, "w") { |f| f.puts "yay" }
         File.chmod(0644, file)
         obj = Puppet::Type.newfile(:path => dir, :mode => 0750, :recurse => "2")
+        config = mk_catalog(obj)
 
         children = nil
         assert_nothing_raised("Failure when recursing") do
@@ -1747,6 +1767,7 @@ class TestFile < Test::Unit::TestCase
         assert(obj.class[subdir], "did not create subdir object")
         children.each do |c|
             assert_nothing_raised("Failure when recursing on %s" % c) do
+                c.catalog = config
                 others = c.eval_generate
             end
         end
@@ -1780,6 +1801,7 @@ class TestFile < Test::Unit::TestCase
         obj = Puppet::Type.newfile(:path => dir, :ensure => :directory,
             :recurse => true)
 
+        config = mk_catalog(obj)
         children = nil
         assert_nothing_raised do
             children = obj.eval_generate
@@ -1799,4 +1821,3 @@ class TestFile < Test::Unit::TestCase
     end
 end
 
-# $Id: file.rb 2629 2007-06-19 22:18:55Z luke $

data/test/ral/types/file/target.rb

@@ -1,11 +1,13 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'fileutils'
 
 class TestFileTarget < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
 
     def setup
@@ -44,6 +46,7 @@ class TestFileTarget < Test::Unit::TestCase
     def test_linkrecurse
         dest = tempfile()
         link = @file.create :path => tempfile(), :recurse => true, :ensure => dest
+        mk_catalog link
         
         ret = nil
         
@@ -317,9 +320,8 @@ class TestFileTarget < Test::Unit::TestCase
             :source => dirs["source"],
             :recurse => true
         )
-
-
-        trans = assert_apply(obj)
+        config = mk_catalog obj
+        config.apply
 
         newfile = File.join(dirs["target"], "sourcefile")
 
@@ -360,4 +362,3 @@ class TestFileTarget < Test::Unit::TestCase
     end
 end
 
-# $Id: target.rb 2487 2007-05-09 01:51:20Z ballman $

data/test/ral/types/filebucket.rb

@@ -1,11 +1,13 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'fileutils'
 
 class TestFileBucket < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
     # hmmm
     # this is complicated, because we store references to the created
@@ -153,4 +155,3 @@ class TestFileBucket < Test::Unit::TestCase
     end
 end
 
-# $Id: filebucket.rb 2316 2007-03-19 16:42:41Z luke $

data/test/ral/types/fileignoresource.rb

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'cgi'
 require 'fileutils'
 
 class TestFileIgnoreSources < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
    
     def setup
@@ -73,19 +75,8 @@ class TestFileIgnoreSources < Test::Unit::TestCase
             )
         }
 
-        #make a component and adds the file
-        comp = Puppet.type(:component).create(
-            :name => "component"
-        )
-        comp.push tofile
-
-        #make, evaluate transaction and sync the component
-        assert_nothing_raised {
-            trans = comp.evaluate
-        }
-        assert_nothing_raised {
-            trans.evaluate
-        }
+        config = mk_catalog(tofile)
+        config.apply
   
       
         #topath should exist as a directory with sourcedir as a directory
@@ -150,19 +141,8 @@ class TestFileIgnoreSources < Test::Unit::TestCase
             )
         }
 
-        #make a component and adds the file
-        comp = Puppet.type(:component).create(
-            :name => "component"
-        )
-        comp.push tofile
-
-        #make, evaluate transaction and sync the component
-        assert_nothing_raised {
-            trans = comp.evaluate
-        }
-        assert_nothing_raised {
-            trans.evaluate
-        }
+        config = mk_catalog(tofile)
+        config.apply
               
         #topath should exist as a directory with sourcedir as a directory
        
@@ -170,6 +150,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
         assert(FileTest.exists?(File.join(topath,sourcefile1)))
         assert(FileTest.exists?(File.join(topath,subdir)))
         assert(FileTest.exists?(File.join(File.join(topath,subdir),sourcefile1)))
+
         #This file should not
         assert(!(FileTest.exists?(File.join(topath,sourcefile2))))
         assert(!(FileTest.exists?(File.join(topath,subdir2))))
@@ -235,19 +216,8 @@ class TestFileIgnoreSources < Test::Unit::TestCase
             )
         }
 
-        #make a component and adds the file
-        comp = Puppet.type(:component).create(
-            :name => "component"
-        )
-        comp.push tofile
-
-        #make, evaluate transaction and sync the component
-        assert_nothing_raised {
-            trans = comp.evaluate
-        }
-        assert_nothing_raised {
-            trans.evaluate
-        }
+        config = mk_catalog(tofile)
+        config.apply
 
         #topath should exist as a directory with sourcedir as a directory
 
@@ -273,5 +243,3 @@ class TestFileIgnoreSources < Test::Unit::TestCase
     end
 
 end
-
-# $Id$

data/test/ral/types/filesources.rb

@@ -1,12 +1,15 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'cgi'
 require 'fileutils'
+require 'mocha'
 
 class TestFileSources < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
     def setup
         super
@@ -17,6 +20,7 @@ class TestFileSources < Test::Unit::TestCase
         end
         @file = Puppet::Type.type(:file)
         Puppet[:filetimeout] = -1
+        Puppet::Util::SUIDManager.stubs(:asuser).yields 
     end
     
     def use_storage
@@ -60,6 +64,7 @@ class TestFileSources < Test::Unit::TestCase
                 :name => path
             )
         }
+        config = mk_catalog(file)
         child = nil
         assert_nothing_raised {
             child = file.newchild("childtest", true)
@@ -273,6 +278,7 @@ class TestFileSources < Test::Unit::TestCase
         # The sourcerecurse method will only ever get called when we're
         # recursing, so we go ahead and set it.
         obj = Puppet::Type.newfile :source => source, :path => dest, :recurse => true
+        config = mk_catalog(obj)
 
         result = nil
         sourced = nil
@@ -286,7 +292,7 @@ class TestFileSources < Test::Unit::TestCase
         assert_equal([dfileobj], result)
         
         # Clean this up so it can be recreated
-        dfileobj.remove
+        config.remove_resource(dfileobj)
         
         # Make sure we correctly iterate over the sources
         nosource = tempfile()
@@ -544,7 +550,7 @@ class TestFileSources < Test::Unit::TestCase
 
         serverpid = nil
         assert_nothing_raised() {
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
                     :FileServer => {
@@ -575,51 +581,6 @@ class TestFileSources < Test::Unit::TestCase
         }
     end
 
-    def test_networkSourcesWithoutService
-        server = nil
-
-        Puppet[:autosign] = true
-        Puppet[:masterport] = 8765
-
-        serverpid = nil
-        assert_nothing_raised() {
-            server = Puppet::Network::Server::WEBrick.new(
-                :Handlers => {
-                    :CA => {}, # so that certs autogenerate
-                }
-            )
-
-        }
-        serverpid = fork {
-            assert_nothing_raised() {
-                #trap(:INT) { server.shutdown; Kernel.exit! }
-                trap(:INT) { server.shutdown }
-                server.start
-            }
-        }
-        @@tmppids << serverpid
-
-        sleep(1)
-
-        name = File.join(tmpdir(), "nosourcefile")
-        file = Puppet.type(:file).create(
-            :source => "puppet://localhost/dist/file",
-            :name => name
-        )
-
-        assert_nothing_raised {
-            file.retrieve
-        }
-
-        comp = newcomp("nosource", file)
-
-        assert_nothing_raised {
-            comp.evaluate
-        }
-
-        assert(!FileTest.exists?(name), "File with no source exists anyway")
-    end
-
     def test_unmountedNetworkSources
         server = nil
         mounts = {
@@ -634,7 +595,7 @@ class TestFileSources < Test::Unit::TestCase
 
         serverpid = nil
         assert_nothing_raised("Could not start on port %s" % @port) {
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
@@ -667,11 +628,8 @@ class TestFileSources < Test::Unit::TestCase
             file.retrieve
         }
 
-        comp = newcomp("nosource", file)
-
-        assert_nothing_raised {
-            comp.evaluate
-        }
+        comp = mk_catalog(file)
+        comp.apply
 
         assert(!FileTest.exists?(name), "File with no source exists anyway")
     end
@@ -720,7 +678,7 @@ class TestFileSources < Test::Unit::TestCase
             )
         }
 
-        comp = newcomp(file)
+        comp = mk_catalog(file)
         assert_events([:file_created], comp)
 
         assert(File.exists?(to), "File does not exist")
@@ -806,9 +764,8 @@ class TestFileSources < Test::Unit::TestCase
         trans = nil
         assert_nothing_raised {
             file[:links] = :manage
-            comp = newcomp(file)
-            trans = comp.evaluate
-            trans.evaluate
+            comp = mk_catalog(file)
+            trans = comp.apply
         }
 
         assert(trans.failed?(file), "Object did not fail to copy links")
@@ -1000,8 +957,13 @@ class TestFileSources < Test::Unit::TestCase
         files = []
         [source1, source2, File.join(source1, "subdir"), File.join(source2, "subdir")].each_with_index do |dir, i|
             Dir.mkdir(dir)
+            # Make a single file in each directory
             file = File.join(dir, "file%s" % i)
             File.open(file, "w") { |f| f.puts "yay%s" % i}
+
+            # Now make a second one in each directory
+            file = File.join(dir, "second-file%s" % i)
+            File.open(file, "w") { |f| f.puts "yaysecond-%s" % i}
             files << file
         end
         
@@ -1009,7 +971,7 @@ class TestFileSources < Test::Unit::TestCase
         
         assert_apply(obj)
         
-        ["file0", "file1", "subdir/file2", "subdir/file3"].each do |file|
+        ["file0", "file1", "second-file0", "second-file1", "subdir/file2", "subdir/second-file2", "subdir/file3", "subdir/second-file3"].each do |file|
             path = File.join(dest, file)
             assert(FileTest.exists?(path), "did not create %s" % file)
             
@@ -1045,4 +1007,3 @@ class TestFileSources < Test::Unit::TestCase
     end
 end
 
-# $Id: filesources.rb 2629 2007-06-19 22:18:55Z luke $