puppet 0.22.4 → 0.23.0

data/test/other/report.rb

@@ -11,6 +11,35 @@ class TestReports < Test::Unit::TestCase
 	include PuppetTest
 	include PuppetTest::Reporttesting
 
+    def mkreport
+        # First do some work
+        objects = []
+        6.times do |i|
+            file = tempfile()
+
+            # Make every third file
+            File.open(file, "w") { |f| f.puts "" } if i % 3 == 0
+
+            objects << Puppet::Type.newfile(
+                :path => file,
+                :ensure => "file"
+            )
+        end
+
+        comp = newcomp(*objects)
+
+        trans = nil
+        assert_nothing_raised("Failed to create transaction") {
+            trans = comp.evaluate
+        }
+
+        assert_nothing_raised("Failed to evaluate transaction") {
+            trans.evaluate
+        }
+
+        return trans.generate_report
+    end
+
     # Make sure we can use reports as log destinations.
     def test_reports_as_log_destinations
         report = fakereport
@@ -91,32 +120,7 @@ class TestReports < Test::Unit::TestCase
     if Puppet.features.rrd?
     def test_rrdgraph_report
         Puppet.config.use(:metrics)
-        # First do some work
-        objects = []
-        6.times do |i|
-            file = tempfile()
-
-            # Make every third file
-            File.open(file, "w") { |f| f.puts "" } if i % 3 == 0
-
-            objects << Puppet::Type.newfile(
-                :path => file,
-                :ensure => "file"
-            )
-        end
-
-        comp = newcomp(*objects)
-
-        trans = nil
-        assert_nothing_raised("Failed to create transaction") {
-            trans = comp.evaluate
-        }
-
-        assert_nothing_raised("Failed to evaluate transaction") {
-            trans.evaluate
-        }
-
-        report = trans.generate_report
+        report = mkreport
 
         assert(! report.metrics.empty?, "Did not receive any metrics")
 
@@ -230,6 +234,19 @@ class TestReports < Test::Unit::TestCase
             end
         end
     end
+
+    def test_summary
+        report = mkreport
+
+        summary = nil
+        assert_nothing_raised("Could not create report summary") do
+            summary = report.summary
+        end
+
+        %w{Changes Total Resources}.each do |main|
+            assert(summary.include?(main), "Summary did not include info for %s" % main)
+        end
+    end
 end
 
-# $Id: report.rb 2438 2007-04-30 18:15:01Z luke $
+# $Id: report.rb 2459 2007-05-04 05:04:29Z luke $

data/test/other/transactions.rb

@@ -7,7 +7,7 @@ require 'puppettest'
 require 'mocha'
 require 'puppettest/support/resources'
 
-# $Id: transactions.rb 2372 2007-03-30 00:47:03Z luke $
+# $Id: transactions.rb 2551 2007-06-04 20:37:14Z luke $
 
 class TestTransactions < Test::Unit::TestCase
     include PuppetTest::FileTesting
@@ -17,7 +17,7 @@ class TestTransactions < Test::Unit::TestCase
         def should_to_s
             @should.to_s
         end
-        def insync?
+        def insync?(foo)
             true
         end
         def info(*args)
@@ -124,8 +124,8 @@ class TestTransactions < Test::Unit::TestCase
 
         # Now create a provider
         type.provide(:prefetch) do
-            def self.prefetch
-                $prefetched = true
+            def self.prefetch(resources)
+                $prefetched = resources
             end
         end
 
@@ -140,7 +140,7 @@ class TestTransactions < Test::Unit::TestCase
             trans.prefetch
         end
 
-        assert_equal(true, $prefetched, "type prefetch was not called")
+        assert_equal({inst.title => inst}, $prefetched, "type prefetch was not called")
 
         # Now make sure it gets called from within evaluate()
         $prefetched = false
@@ -148,7 +148,7 @@ class TestTransactions < Test::Unit::TestCase
             trans.evaluate
         end
 
-        assert_equal(true, $prefetched, "evaluate did not call prefetch")
+        assert_equal({inst.title => inst}, $prefetched, "evaluate did not call prefetch")
     end
 
     def test_refreshes_generate_events
@@ -248,8 +248,9 @@ class TestTransactions < Test::Unit::TestCase
 
         assert_nothing_raised() {
             check.each { |property|
-                assert(file[property])
-                properties[property] = file[property]
+                value = file.value(property)
+                assert(value)
+                properties[property] = value
             }
         }
 
@@ -277,7 +278,7 @@ class TestTransactions < Test::Unit::TestCase
         }
         properties.each { |property,value|
             assert_equal(
-                value,file.is(property), "File %s remained %s" % [property, file.is(property)]
+                value, file.value(property), "File %s remained %s" % [property, file.value(property)]
             )
         }
     end
@@ -310,7 +311,7 @@ class TestTransactions < Test::Unit::TestCase
         }
 
         check.each { |property|
-            properties[property] = file[property]
+            properties[property] = file.value(property)
         }
         assert_nothing_raised() {
             file[:mode] = "755"
@@ -466,7 +467,7 @@ class TestTransactions < Test::Unit::TestCase
 
         file[:content] = "totally different content"
 
-        assert(! file.insync?, "Uh, file is in sync?")
+        assert(! file.insync?(file.retrieve), "Uh, file is in sync?")
 
         assert_events([:file_changed, :triggered], comp)
         assert(FileTest.exists?(fname), "File did not get recreated")
@@ -766,7 +767,7 @@ class TestTransactions < Test::Unit::TestCase
         type = mkreducer do
             def evaluate
                 return Puppet::PropertyChange.new(Fakeprop.new(
-                    :path => :path, :is => :is, :should => :should, :name => self.name, :parent => "a parent"))
+                    :path => :path, :is => :is, :should => :should, :name => self.name, :resource => "a parent"), :is)
             end
         end
         
@@ -778,7 +779,7 @@ class TestTransactions < Test::Unit::TestCase
         assert_nothing_raised do
             trans.eval_resource(resource)
         end
-        
+
         changes = trans.instance_variable_get("@changes")
         
         assert(changes.length > 0, "did not get any changes")
@@ -884,7 +885,7 @@ class TestTransactions < Test::Unit::TestCase
     end
 
     def test_graph
-        Puppet.config.use(:puppet)
+        Puppet.config.use(:main)
         # Make a graph
         graph = Puppet::PGraph.new
         graph.add_edge!("a", "b")
@@ -1015,7 +1016,7 @@ class TestTransactions < Test::Unit::TestCase
         
         obj = type.create(:name => "yay", :testing => "cool")
         
-        assert(! obj.insync?, "fake object is already in sync")
+        assert(! obj.insync?(obj.retrieve), "fake object is already in sync")
         
         # Now make sure it gets refreshed when the change happens
         assert_apply(obj)
@@ -1149,4 +1150,4 @@ class TestTransactions < Test::Unit::TestCase
     end
 end
 
-# $Id: transactions.rb 2372 2007-03-30 00:47:03Z luke $
+# $Id: transactions.rb 2551 2007-06-04 20:37:14Z luke $

data/test/puppet/tc_suidmanager.rb

@@ -76,7 +76,7 @@ class TestSUIDManager < Test::Unit::TestCase
         if @run 
             user = nonrootuser
             status = Puppet::Util::SUIDManager.system("exit $EUID", user.uid, user.gid)
-            assert_equal(user.uid, status.exitstatus)
+            assert_equal(user.uid, status.exitstatus, "EUID does not seem to be inherited.  This test consistently fails on RedHat-like machines.")
         end
     end
 
@@ -104,4 +104,4 @@ class TestSUIDManager < Test::Unit::TestCase
     end
 end
 
-# $Id: tc_suidmanager.rb 2178 2007-02-07 23:56:59Z luke $
+# $Id: tc_suidmanager.rb 2625 2007-06-19 01:51:48Z luke $

data/test/rails/ast.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+
+require 'puppettest'
+require 'puppet/rails'
+require 'puppet/parser/parser'
+require 'puppettest/resourcetesting'
+require 'puppettest/parsertesting'
+require 'puppettest/railstesting'
+require 'puppettest/support/collection'
+
+class TestRailsAST < PuppetTest::TestCase
+    confine "Missing rails" => Puppet.features.rails?
+    include PuppetTest::RailsTesting
+    include PuppetTest::ParserTesting
+    include PuppetTest::ResourceTesting
+    include PuppetTest::Support::Collection
+
+    def test_exported_collexp
+        railsinit
+        Puppet[:storeconfigs] = true
+        @interp, @scope, @source = mkclassframing
+
+        # make a rails resource
+        railsresource "file", "/tmp/testing", :owner => "root", :group => "bin",
+            :mode => "644" 
+
+        run_collection_queries(:exported) do |string, result, query|
+            code = nil
+            str = nil
+
+            # We don't support anything but the title in rails right now
+            retval = nil
+            bad = false
+            # Figure out if the search is for anything rails will ignore
+            string.scan(/(\w+) [!=]= \w+/) do |s|
+                unless s[0] == "title"
+                    bad = true
+                    break
+                end
+            end
+
+            # And if it is, make sure we throw an error.
+            if bad
+                assert_raise(Puppet::ParseError, "Evaluated '#{string}'") do
+                    str, code = query.evaluate :scope => @scope
+                end
+                next
+            else
+                assert_nothing_raised("Could not evaluate '#{string}'") do
+                    str, code = query.evaluate :scope => @scope
+                end
+            end
+            assert_nothing_raised("Could not find resource") do
+                retval = Puppet::Rails::Resource.find(:all,
+                    :include => :param_values,
+                    :conditions => str) 
+            end
+
+            if result
+                assert_equal(1, retval.length, "Did not find resource with '#{string}'")
+                res = retval.shift
+
+                assert_equal("file", res.restype)
+                assert_equal("/tmp/testing", res.title)
+            else
+                assert_equal(0, retval.length, "found a resource with '#{string}'")
+            end
+        end
+    end
+end
+
+# $Id: ast.rb 2597 2007-06-17 21:41:50Z luke $

data/test/rails/collection.rb

@@ -0,0 +1,214 @@
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+
+require 'puppet'
+require 'puppet/rails'
+require 'puppettest'
+require 'puppettest/railstesting'
+require 'puppettest/resourcetesting'
+
+
+# A separate class for testing rails integration
+class TestRailsCollection < PuppetTest::TestCase
+    confine "Missing rails support" => Puppet.features.rails?
+	include PuppetTest
+    include PuppetTest::ParserTesting
+    include PuppetTest::ResourceTesting
+    include PuppetTest::RailsTesting
+    Parser = Puppet::Parser
+    AST = Parser::AST
+
+    def setup
+        super
+        Puppet[:trace] = false
+        @interp, @scope, @source = mkclassframing
+    end
+
+    def test_collect_exported
+        railsinit
+
+        # Set a hostname
+        @scope.host = Facter.value(:hostname)
+
+        # make an exported resource
+        exported = mkresource(:type => "file", :title => "/tmp/exported",
+            :exported => true, :params => {:owner => "root"})
+        @scope.setresource exported
+
+        assert(exported.exported?, "Object was not marked exported")
+        assert(exported.virtual?, "Object was not marked virtual")
+
+        # And a non-exported
+        real = mkresource(:type => "file", :title => "/tmp/real",
+            :params => {:owner => "root"})
+        @scope.setresource real
+
+        # Now make a collector
+        coll = nil
+        assert_nothing_raised do
+            coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported)
+        end
+
+        # Set it in our scope
+        @scope.newcollection(coll)
+
+        # Make sure it's in the collections
+        assert_equal([coll], @scope.collections)
+
+        # And try to collect the virtual resources.
+        ret = nil
+        assert_nothing_raised do
+            ret = coll.collect_exported
+        end
+
+        assert_equal([exported], ret)
+
+        # Now make sure evaluate does the right thing.
+        assert_nothing_raised do
+            ret = coll.evaluate
+        end
+
+        # Make sure that the collection does not find the resource on the
+        # next run.
+        ret = nil
+        assert_nothing_raised do
+            ret = coll.collect_exported
+        end
+
+        assert(ret.empty?, "Exported resource was collected on the second run")
+
+
+        # And make sure our exported object is no longer exported
+        assert(! exported.virtual?, "Virtual object did not get realized")
+
+        # But it should still be marked exported.
+        assert(exported.exported?, "Resource got un-exported")
+
+        # Now make a new collector of a different type and make sure it
+        # finds nothing.
+        assert_nothing_raised do
+            coll = Puppet::Parser::Collector.new(@scope, "exec", nil, nil, :exported)
+        end
+
+        # Remark this as virtual
+        exported.virtual = true
+
+        assert_nothing_raised do
+            ret = coll.evaluate
+        end
+
+        assert(! ret, "got resources back")
+
+        # Now create a whole new scope and make sure we can actually retrieve
+        # the resource from the database, not just from the scope.
+        # First create a host object and store our resource in it.
+
+        # Now collect our facts
+        facts = {}
+        Facter.each do |fact, value| facts[fact] = value end 
+
+        # Now try storing our crap
+        # Remark this as exported
+        exported.exported = true
+        host = Puppet::Rails::Host.store(
+            :resources => [exported],
+            :facts => facts,
+            :name => facts["hostname"]
+        )
+        assert(host, "did not get rails host")
+        host.save
+
+        # And make sure it's in there
+        newres = host.resources.find_by_restype_and_title_and_exported("file", "/tmp/exported", true)
+        assert(newres, "Did not find resource in db")
+        interp, scope, source = mkclassframing
+        scope.host = "two"
+
+        # Now make a collector
+        coll = nil
+        assert_nothing_raised do
+            coll = Puppet::Parser::Collector.new(scope, "file", nil, nil, :exported)
+        end
+
+        # Set it in our scope
+        scope.newcollection(coll)
+
+        # Make sure it's in the collections
+        assert_equal([coll], scope.collections)
+
+        # And try to collect the virtual resources.
+        ret = nil
+        assert_nothing_raised do
+            ret = coll.collect_exported
+        end
+
+        assert_equal(["/tmp/exported"], ret.collect { |f| f.title })
+
+        # Make sure we can evaluate the same collection multiple times and
+        # that later collections do nothing
+        assert_nothing_raised("Collection found same resource twice") do
+            ret = coll.evaluate
+        end
+    end
+
+    def test_collection_conflicts
+        railsinit
+
+        # First make a railshost we can conflict with
+        host = Puppet::Rails::Host.new(:name => "myhost")
+
+        host.resources.build(:title => "/tmp/conflicttest", :restype => "file",
+            :exported => true)
+
+        host.save
+
+        # Now make a normal resource
+        normal = mkresource(:type => "file", :title => "/tmp/conflicttest",
+            :params => {:owner => "root"})
+        @scope.setresource normal
+        @scope.host = "otherhost"
+
+        # Now make a collector
+        coll = nil
+        assert_nothing_raised do
+            coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported)
+        end
+
+        # And try to collect the virtual resources.
+        assert_raise(Puppet::ParseError) do
+            ret = coll.collect_exported
+        end
+    end
+
+    # Make sure we do not collect resources from the host we're on
+    def test_no_resources_from_me
+        railsinit
+
+        # Make our configuration
+        host = Puppet::Rails::Host.new(:name => "myhost")
+
+        host.resources.build(:title => "/tmp/hosttest", :type => "file",
+            :exported => true)
+
+        host.save
+
+        @scope.host = "myhost"
+
+        # Now make a collector
+        coll = nil
+        assert_nothing_raised do
+            coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported)
+        end
+
+        # And make sure we get nada back
+        ret = nil
+        assert_nothing_raised do
+            ret = coll.collect_exported
+        end
+
+        assert(ret.empty?, "Found exports from our own host")
+    end
+end
+
+# $Id: collection.rb 2596 2007-06-17 01:02:31Z luke $