puppet 0.23.2 → 0.24.0

data/test/rails/rails.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/rails'
@@ -24,4 +24,3 @@ class TestRails < Test::Unit::TestCase
     end
 end
 
-# $Id: rails.rb 2179 2007-02-08 01:39:39Z luke $

data/test/rails/railsparameter.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/rails'
@@ -21,8 +21,8 @@ class TestRailsParameter < Test::Unit::TestCase
         railsinit
 
         # Now create a source
-        interp = mkinterp
-        source = interp.newclass "myclass"
+        parser = mkparser
+        source = parser.newclass "myclass"
 
         host = Puppet::Rails::Host.new(:name => "myhost")
         
@@ -70,4 +70,3 @@ else
     $stderr.puts "Install Rails for Rails and Caching tests"
 end
 
-# $Id: railsparameter.rb 2565 2007-06-12 00:31:16Z ballman $

data/test/rails/railsresource.rb

@@ -1,18 +1,20 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/rails'
 require 'puppettest'
 require 'puppettest/railstesting'
 require 'puppettest/resourcetesting'
+require 'puppettest/parsertesting'
 
 # Don't do any tests w/out this class
 if Puppet.features.rails?
 class TestRailsResource < Test::Unit::TestCase
     include PuppetTest::RailsTesting
     include PuppetTest::ResourceTesting
+    include PuppetTest::ParserTesting
 
     def setup
         super
@@ -55,7 +57,7 @@ class TestRailsResource < Test::Unit::TestCase
         resource = mktest_resource
 
         # We need a scope
-        interp, scope, source = mkclassframing
+        scope = mkscope
 
         # Find the new resource and include all it's parameters.
         resource = Puppet::Rails::Resource.find_by_id(resource.id)
@@ -69,7 +71,7 @@ class TestRailsResource < Test::Unit::TestCase
         assert_equal("root", res[:owner])
         assert_equal("644", res[:mode])
         assert_equal("/tmp/to_resource", res.title)
-        assert_equal(source, res.source)
+        assert_equal(scope.source, res.source)
     end
 
     def test_parameters
@@ -111,7 +113,7 @@ class TestExportedResources < PuppetTest::TestCase
     def setup
         super
         Puppet[:trace] = false
-        @interp, @scope, @source = mkclassframing
+        @scope = mkscope
     end
 
     confine "Missing rails support" => Puppet.features.rails?
@@ -245,5 +247,4 @@ class TestExportedResources < PuppetTest::TestCase
     end
 end
 
-# $Id: railsresource.rb 2706 2007-07-18 19:47:09Z luke $
 

data/test/ral/manager/attributes.rb

@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-02-05.
 #  Copyright (c) 2007. All rights reserved.
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
@@ -349,4 +349,3 @@ class TestTypeAttributes < Test::Unit::TestCase
     end
 end
 
-# $Id: attributes.rb 2684 2007-07-12 16:39:47Z luke $

data/test/ral/manager/instances.rb

@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-06-10.
 #  Copyright (c) 2007. All rights reserved.
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 
@@ -93,7 +93,8 @@ class TestTypeInstances < Test::Unit::TestCase
     # Make sure resources are entirely deleted.
     def test_delete
         aliases = %w{one}
-        obj = @type.create(:name => "testing", :alias => "two")
+        catalog = mk_catalog
+        obj = @type.create(:name => "testing", :alias => "two", :catalog => catalog)
         aliases << "two"
 
         @type.alias("two", obj)
@@ -106,4 +107,3 @@ class TestTypeInstances < Test::Unit::TestCase
     end
 end
 
-# $Id: instances.rb 2718 2007-07-19 22:12:51Z luke $

data/test/ral/manager/manager.rb

@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2006-11-29.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 
@@ -52,4 +52,3 @@ class TestTypeManager < Test::Unit::TestCase
     end
 end
 
-# $Id: manager.rb 2169 2007-02-07 06:47:10Z luke $

data/test/ral/manager/provider.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
@@ -89,4 +89,3 @@ class TestTypeProviders < Test::Unit::TestCase
     end
 end
 
-# $Id: provider.rb 2552 2007-06-05 01:17:00Z luke $

data/test/ral/manager/type.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
@@ -131,27 +131,60 @@ class TestType < Test::Unit::TestCase
         }
     end
 
-    # Verify that aliasing works
-    def test_aliasing
-        file = tempfile()
+    def test_aliases_to_self_are_not_failures
+        resource = Puppet.type(:file).create(
+            :name => "/path/to/some/missing/file",
+            :ensure => "file"
+        )
+        resource.stubs(:path).returns("")
 
-        baseobj = nil
-        assert_nothing_raised {
-            baseobj = Puppet.type(:file).create(
-                :name => file,
-                :ensure => "file",
-                :alias => ["funtest"]
-            )
-        }
+        catalog = stub 'catalog'
+        catalog.expects(:resource).with(:file, "/path/to/some/missing/file").returns(resource)
+        resource.catalog = catalog
 
         # Verify our adding ourselves as an alias isn't an error.
-        assert_nothing_raised {
-            baseobj[:alias] = file
+        assert_nothing_raised("Could not add alias") {
+            resource[:alias] = "/path/to/some/missing/file"
+        }
+
+        assert_equal(resource.object_id, Puppet.type(:file)["/path/to/some/missing/file"].object_id, "Could not retrieve alias to self")
+    end
+
+    def test_aliases_are_added_to_class_and_catalog
+        resource = Puppet.type(:file).create(
+            :name => "/path/to/some/missing/file",
+            :ensure => "file"
+        )
+        resource.stubs(:path).returns("")
+
+        catalog = stub 'catalog'
+        catalog.stubs(:resource).returns(nil)
+        catalog.expects(:alias).with(resource, "funtest")
+        resource.catalog = catalog
+
+        assert_nothing_raised("Could not add alias") {
+            resource[:alias] = "funtest"
         }
 
-        assert_instance_of(Puppet.type(:file), Puppet.type(:file)["funtest"],
-            "Could not retrieve alias")
+        assert_equal(resource.object_id, Puppet.type(:file)["funtest"].object_id, "Could not retrieve alias")
+    end
+
+    def test_aliasing_fails_without_a_catalog
+        resource = Puppet.type(:file).create(
+            :name => "/no/such/file",
+            :ensure => "file"
+        )
+
+        assert_raise(Puppet::Error, "Did not fail to alias when no catalog was available") {
+            resource[:alias] = "funtest"
+        }
+    end
 
+    def test_catalogs_are_set_during_initialization_if_present_on_the_transobject
+        trans = Puppet::TransObject.new("/path/to/some/file", :file)
+        trans.catalog = :my_config
+        resource = trans.to_type
+        assert_equal(resource.catalog, trans.catalog, "Did not set catalog on initialization")
     end
 
     # Verify that requirements don't depend on file order
@@ -174,7 +207,7 @@ class TestType < Test::Unit::TestCase
             )
         }
 
-        comp = newcomp(twoobj, oneobj)
+        comp = mk_catalog(twoobj, oneobj)
 
         assert_nothing_raised {
             comp.finalize
@@ -246,76 +279,6 @@ class TestType < Test::Unit::TestCase
         # and make sure managed objects start with them
         assert(user.property(:ensure), "User did not get an ensure property")
     end
-
-    # Make sure removal works
-    def test_remove
-        objects = {}
-        top = Puppet.type(:component).create(:name => "top")
-        objects[top.class] = top
-
-        base = tempfile()
-
-        # now make a two-tier, 5 piece tree
-        %w{a b}.each do |letter|
-            name = "comp%s" % letter
-            comp = Puppet.type(:component).create(:name => name)
-            top.push comp
-            objects[comp.class] = comp
-
-            5.times do |i|
-                file = base + letter + i.to_s
-
-                obj = Puppet.type(:file).create(:name => file, :ensure => "file")
-
-                comp.push obj
-                objects[obj.class] = obj
-            end
-        end
-
-        assert_nothing_raised do
-            top.remove
-        end
-
-        objects.each do |klass, obj|
-            assert_nil(klass[obj.name], "object %s was not removed" % obj.name)
-        end
-    end
-
-    # Verify that objects can't be their own children.
-    def test_object_recursion
-        comp = Puppet.type(:component).create(:name => "top")
-
-        file = Puppet.type(:component).create(:name => "middle")
-
-        assert_raise(Puppet::DevError) do
-            comp.push(comp)
-        end
-
-        assert_raise(Puppet::DevError) do
-            file.push(file)
-        end
-
-        assert_raise(Puppet::DevError) do
-            comp.parent = comp
-        end
-
-        assert_raise(Puppet::DevError) do
-            file.parent = file
-        end
-
-        assert_nothing_raised {
-            comp.push(file)
-        }
-
-        assert_raise(Puppet::DevError) do
-            file.push(comp)
-        end
-
-        assert_raise(Puppet::DevError) do
-            comp.parent = file
-        end
-    end
-
     def test_newtype_methods
         assert_nothing_raised {
             Puppet::Type.newtype(:mytype) do
@@ -732,12 +695,22 @@ class TestType < Test::Unit::TestCase
     end
     
     def test_path
+        config = mk_catalog
+
         # Check that our paths are built correctly.  Just pick a random, "normal" type.
         type = Puppet::Type.type(:exec)
         mk = Proc.new do |i, hash|
             hash[:title] = "exec%s" % i
             hash[:command] = "/bin/echo"
-            type.create(hash)
+            if parent = hash[:parent]
+                hash.delete(:parent)
+            end
+            res = type.create(hash)
+            config.add_resource res
+            if parent
+                config.add_edge!(parent, res)
+            end
+            res
         end
         
         exec = mk.call(1, {})
@@ -745,25 +718,31 @@ class TestType < Test::Unit::TestCase
         assert_equal("/Exec[exec1]", exec.path)
         
         comp = Puppet::Type.newcomponent :title => "My[component]", :type => "Yay"
+        config.add_resource comp
         
         exec = mk.call(2, :parent => comp)
         
         assert_equal("/My[component]/Exec[exec2]", exec.path)
         
         comp = Puppet::Type.newcomponent :name => "Other[thing]"
+        config.add_resource comp
         exec = mk.call(3, :parent => comp)
         assert_equal("/Other[thing]/Exec[exec3]", exec.path)
         
         comp = Puppet::Type.newcomponent :type => "server", :name => "server"
+        config.add_resource comp
         exec = mk.call(4, :parent => comp)
         assert_equal("/server/Exec[exec4]", exec.path)
         
-        comp = Puppet::Type.newcomponent :type => "whatever", :name => "main[top]"
+        comp = Puppet::Type.newcomponent :type => "whatever", :name => "class[main]"
+        config.add_resource comp
         exec = mk.call(5, :parent => comp)
         assert_equal("//Exec[exec5]", exec.path)
         
-        comp = Puppet::Type.newcomponent :type => "yay", :name => "Good[bad]", :parent => comp
-        exec = mk.call(6, :parent => comp)
+        newcomp = Puppet::Type.newcomponent :type => "yay", :name => "Good[bad]"
+        config.add_resource newcomp
+        config.add_edge! comp, newcomp
+        exec = mk.call(6, :parent => newcomp)
         assert_equal("//Good[bad]/Exec[exec6]", exec.path)
     end
 
@@ -815,6 +794,23 @@ class TestType < Test::Unit::TestCase
             end
         end
     end
-end
 
-# $Id: type.rb 2683 2007-07-12 16:04:34Z luke $
+    # #801 -- resources only checked in noop should be rescheduled immediately.
+    def test_reschedule_when_noop
+        Puppet::Type.type(:schedule).mkdefaultschedules
+        file = Puppet::Type.type(:file).create(:path => "/tmp/whatever", :mode => "755", :noop => true, :schedule => :daily, :ensure => :file)
+
+        assert(file.noop?, "File not considered in noop")
+        assert(file.scheduled?, "File is not considered scheduled")
+
+        file.evaluate
+
+        assert_nil(file.cached(:checked), "Stored a checked time when running in noop mode when there were changes")
+        file.cache(:checked, nil)
+
+        file.stubs(:propertychanges).returns([])
+
+        file.evaluate
+        assert_instance_of(Time, file.cached(:checked), "Did not store a checked time when running in noop mode when there were no changes")
+    end
+end

data/test/ral/providers/cron/crontab.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
@@ -52,7 +52,6 @@ class TestCronParsedProvider < Test::Unit::TestCase
 
     def teardown
         Puppet::Util::FileType.filetype(:ram).clear
-        @provider.filetype = @oldfiletype
         @provider.clear
         super
     end
@@ -211,7 +210,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
     # Take our sample files, and make sure we can entirely parse them,
     # then that we can generate them again and we get the same data.
     def test_parse_and_generate_sample_files
-        @provider.filetype = :ram
+        @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram))
         crondir = datadir(File.join(%w{providers cron}))
         files = Dir.glob("%s/crontab.*" % crondir)
 
@@ -306,7 +305,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
         str = "# this is a comment\n#and another comment\n"
         user = "fakeuser"
         records = nil
-        target = @provider.filetype = :ram
+        @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram))
         target = @provider.target_object(user)
         target.write(str)
         assert_nothing_raised {
@@ -320,7 +319,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
     end
 
     def test_simpleparsing
-        @provider.filetype = :ram
+        @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram))
         text = "5 1,2 * 1 0 /bin/echo funtest"
 
         records = nil
@@ -376,7 +375,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
 
     # Make sure we correctly bidirectionally parse things.
     def test_records_and_strings
-        @provider.filetype = :ram
+        @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram))
         setme
 
         target = @provider.target_object(@me)
@@ -426,7 +425,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
         0,30 * * 1 * fooness
         "
         setme
-        @provider.filetype = :ram
+        @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram))
         you = "you"
 
         # Write the same tab to multiple targets
@@ -486,7 +485,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
 
     def test_data
         setme
-        @provider.filetype = :ram
+        @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram))
         target = @provider.target_object(@me)
         fakedata("data/providers/cron/examples").each do |file|
             text = File.read(file)
@@ -518,7 +517,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
 
     # Match freebsd's annoying @daily stuff.
     def test_match_freebsd_special
-        @provider.filetype = :ram
+        @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram))
         setme
 
         target = @provider.target_object(@me)
@@ -561,7 +560,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
 
     # Testing #669.
     def test_environment_settings
-        @provider.filetype = :ram
+        @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram))
         setme
 
         target = @provider.target_object(@me)
@@ -601,4 +600,3 @@ class TestCronParsedProvider < Test::Unit::TestCase
     end
 end
 
-# $Id: crontab.rb 2750 2007-08-06 17:59:37Z luke $