puppet 0.23.2 → 0.24.0

data/test/lib/puppettest/certificates.rb

@@ -58,4 +58,3 @@ module PuppetTest::Certificates
     end
 end
 
-# $Id: certificates.rb 1835 2006-11-08 05:22:24Z luke $

data/test/lib/puppettest/exetest.rb

@@ -127,4 +127,3 @@ module PuppetTest::ExeTest
     end
 end
 
-# $Id$

data/test/lib/puppettest/fakes.rb

@@ -202,4 +202,3 @@ module PuppetTest
     module_function :fakeprovider
 end
 
-# $Id$

data/test/lib/puppettest/fileparsing.rb

@@ -2,20 +2,11 @@ module PuppetTest::FileParsing
     # Run an isomorphism test on our parsing process.
     def fakedataparse(*files)
         files.each do |file|
-            oldtarget = @provider.default_target
-            cleanup do
-                @provider.default_target = oldtarget
-            end
-            @provider.default_target = file
+            @provider.stubs(:default_target).returns(file)
 
-            assert_nothing_raised("failed to fetch %s" % file) {
-                @provider.prefetch
-            }
+            @provider.prefetch
 
-            text = nil
-            assert_nothing_raised("failed to generate %s" % file) do 
-                text = @provider.to_file(@provider.target_records(file))
-            end
+            text = @provider.to_file(@provider.target_records(file))
             text.gsub!(/^# HEADER.+\n/, '')
 
             yield if block_given?
@@ -23,11 +14,13 @@ module PuppetTest::FileParsing
             oldlines = File.readlines(file)
             newlines = text.chomp.split "\n"
             oldlines.zip(newlines).each do |old, new|
-                assert_equal(old.chomp.gsub(/\s+/, ''), new.gsub(/\s+/, ''),
-                    "Lines are not equal in %s" % file)
+                if self.is_a?(Test::Unit::TestCase)
+                    assert_equal(old.chomp.gsub(/\s+/, ''), new.gsub(/\s+/, ''), "File was not written back out correctly")
+                else
+                    new.gsub(/\s+/, '').should == old.chomp.gsub(/\s+/, '')
+                end
             end
         end
     end
 end
 
-# $Id: fileparsing.rb 2296 2007-03-18 22:48:57Z luke $

data/test/lib/puppettest/filetesting.rb

@@ -228,4 +228,3 @@ module PuppetTest::FileTesting
     end
 end
 
-# $Id: filetesting.rb 1632 2006-09-19 18:04:20Z luke $

data/test/lib/puppettest/parsertesting.rb

@@ -5,6 +5,8 @@ module PuppetTest::ParserTesting
     include PuppetTest
     AST = Puppet::Parser::AST
 
+    Compile = Puppet::Parser::Compile
+
     # A fake class that we can use for testing evaluation.
     class FakeAST
         attr_writer :evaluate
@@ -39,10 +41,21 @@ module PuppetTest::ParserTesting
         )
     end
 
-    def mkinterp(args = {})
-        args[:Code] ||= "" unless args.include?(:Manifest)
-        args[:Local] ||= true
-        Puppet::Parser::Interpreter.new(args)
+    def mkcompile(parser = nil)
+        parser ||= mkparser
+        node = mknode
+        return Compile.new(node, parser)
+    end
+
+    def mknode(name = nil)
+        require 'puppet/node'
+        name ||= "nodename"
+        Puppet::Network::Handler.handler(:node)
+        Puppet::Node.new(name)
+    end
+
+    def mkinterp
+        Puppet::Parser::Interpreter.new
     end
 
     def mkparser
@@ -50,14 +63,16 @@ module PuppetTest::ParserTesting
     end
 
     def mkscope(hash = {})
-        hash[:interp] ||= mkinterp
-        hash[:source] ||= (hash[:interp].findclass("", "") ||
-            hash[:interp].newclass(""))
+        hash[:parser] ||= mkparser
+        compile ||= mkcompile(hash[:parser])
+        compile.topscope.source = (hash[:parser].findclass("", "") || hash[:parser].newclass(""))
 
-        unless hash[:source]
+        unless compile.topscope.source
             raise "Could not find source for scope"
         end
-        Puppet::Parser::Scope.new(hash)
+        # Make the 'main' stuff
+        compile.send(:evaluate_main)
+        compile.topscope
     end
 
     def classobj(name, hash = {})
@@ -87,7 +102,7 @@ module PuppetTest::ParserTesting
             title = stringobj(title)
         end
         assert_nothing_raised("Could not create %s %s" % [type, title]) {
-            return AST::ResourceDef.new(
+            return AST::Resource.new(
                 :file => __FILE__,
                 :line => __LINE__,
                 :title => title,
@@ -117,7 +132,7 @@ module PuppetTest::ParserTesting
 
     def resourceref(type, title)
         assert_nothing_raised("Could not create %s %s" % [type, title]) {
-            return AST::ResourceRef.new(
+            return AST::ResourceReference.new(
                 :file => __FILE__,
                 :line => __LINE__,
                 :type => type,
@@ -173,7 +188,7 @@ module PuppetTest::ParserTesting
             params = hash.collect { |param, value|
             resourceparam(param, value)
         }
-        return AST::ResourceInst.new(
+        return AST::ResourceInstance.new(
                                    :file => tempfile(),
                                    :line => rand(100),
                                    :children => params
@@ -284,28 +299,29 @@ module PuppetTest::ParserTesting
     # This assumes no nodes
     def assert_creates(manifest, *files)
         interp = nil
+        oldmanifest = Puppet[:manifest]
+        Puppet[:manifest] = manifest
         assert_nothing_raised {
-            interp = Puppet::Parser::Interpreter.new(
-                                                     :Manifest => manifest,
-                                                     :UseNodes => false
-                                                    )
+            interp = Puppet::Parser::Interpreter.new
         }
 
-        config = nil
+        trans = nil
         assert_nothing_raised {
-            config = interp.run(Facter["hostname"].value, {})
+            trans = interp.compile(mknode)
         }
 
-        comp = nil
+        config = nil
         assert_nothing_raised {
-            comp = config.to_type
+            config = trans.extract.to_catalog
         }
 
-        assert_apply(comp)
+        config.apply
 
         files.each do |file|
             assert(FileTest.exists?(file), "Did not create %s" % file)
         end
+    ensure
+        Puppet[:manifest] = oldmanifest
     end
 
     def mk_transobject(file = "/etc/passwd")
@@ -388,5 +404,3 @@ module PuppetTest::ParserTesting
         return trans
     end
 end
-
-# $Id: parsertesting.rb 2742 2007-08-03 23:49:53Z luke $

data/test/lib/puppettest/railstesting.rb

@@ -40,12 +40,10 @@ module PuppetTest::RailsTesting
 
         # Now try storing our crap
         host = nil 
+        node = mknode(facts["hostname"])
+        node.parameters = facts
         assert_nothing_raised {
-            host = Puppet::Rails::Host.store(
-                :resources => resources,
-                :facts => facts,
-                :name => facts["hostname"]
-            )
+            host = Puppet::Rails::Host.store(node, resources)
         }        
 
         # Now save the whole thing
@@ -53,4 +51,3 @@ module PuppetTest::RailsTesting
     end
 end
 
-# $Id: railstesting.rb 2567 2007-06-12 00:38:03Z ballman $

data/test/lib/puppettest/reporttesting.rb

@@ -16,4 +16,3 @@ module PuppetTest::Reporttesting
     end
 end
 
-# $Id: reporttesting.rb 1797 2006-10-17 15:12:48Z luke $

data/test/lib/puppettest/resourcetesting.rb

@@ -1,25 +1,10 @@
 module PuppetTest::ResourceTesting
     Parser = Puppet::Parser
     AST = Puppet::Parser::AST
-    def mkclassframing(interp = nil)
-        interp ||= mkinterp
 
-        interp.newdefine("resource", :arguments => [%w{one}, %w{two value}, %w{three}])
-        interp.newclass("")
-        source = interp.newclass("base")
-        interp.newclass("sub1", :parent => "base")
-        interp.newclass("sub2", :parent => "base")
-        interp.newclass("other")
-
-        scope = Parser::Scope.new(:interp => interp)
-        scope.source = source
-
-        return interp, scope, source
-    end
-
-    def mkevaltest(interp = nil)
-        interp ||= mkinterp
-        @interp.newdefine("evaltest",
+    def mkevaltest(parser = nil)
+        parser ||= mkparser
+        @parser.newdefine("evaltest",
             :arguments => [%w{one}, ["two", stringobj("755")]],
             :code => resourcedef("file", "/tmp",
                 "owner" => varref("one"), "mode" => varref("two"))
@@ -27,26 +12,14 @@ module PuppetTest::ResourceTesting
     end
 
     def mkresource(args = {})
-
-        if args[:scope] and ! args[:source]
-            args[:source] = args[:scope].source
-        end
-
-        unless args[:scope]
-            unless defined? @scope
-                raise "Must set @scope to mkresource"
-            end
-        end
+        args[:source] ||= "source"
+        args[:scope] ||= mkscope
 
         {:type => "resource", :title => "testing",
-            :source => @source, :scope => @scope}.each do |param, value|
+            :source => "source", :scope => "scope"}.each do |param, value|
                 args[param] ||= value
         end
 
-        unless args[:source].is_a?(Puppet::Parser::AST::HostClass)
-            args[:source] = args[:scope].findclass(args[:source])
-        end
-
         params = args[:params] || {:one => "yay", :three => "rah"}
         if args[:params] == :none
             args.delete(:params)
@@ -70,4 +43,3 @@ module PuppetTest::ResourceTesting
     end
 end
 
-# $Id: resourcetesting.rb 1739 2006-10-06 03:13:15Z luke $

data/test/lib/puppettest/runnable_test.rb

@@ -0,0 +1,30 @@
+# Manage whether a test is runnable.
+module PuppetTest
+    module RunnableTest
+        # Confine this test based on specified criteria.  The keys of the
+        # hash should be the message to use if the test is not suitable,
+        # and the values should be either 'true' or 'false'; true values
+        # mean the test is suitable.
+        def confine(hash)
+            @confines ||= {}
+            hash.each do |message, result|
+                @confines[message] = result
+            end
+        end
+
+        # Evaluate all of our tests to see if any of them are false
+        # and thus whether this test is considered not runnable.
+        def runnable?
+            @messages ||= []
+            return false unless @messages.empty?
+            return true unless defined? @confines
+            @confines.find_all do |message, result|
+                ! result
+            end.each do |message, result|
+                @messages << message
+            end
+
+            return @messages.empty?
+        end
+    end
+end

data/test/lib/puppettest/servertest.rb

@@ -1,5 +1,5 @@
 require 'puppettest'
-require 'puppet/network/server/webrick'
+require 'puppet/network/http_server/webrick'
 
 module PuppetTest::ServerTest
     include PuppetTest
@@ -47,7 +47,7 @@ module PuppetTest::ServerTest
         # then create the actual server
         server = nil
         assert_nothing_raised {
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @@port,
                 :Handlers => handlers
             )
@@ -69,4 +69,3 @@ module PuppetTest::ServerTest
 
 end
 
-# $Id$

data/test/lib/puppettest/support/assertions.rb

@@ -1,7 +1,9 @@
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'fileutils'
 
 module PuppetTest
+    include PuppetTest::Support::Utils
     def assert_logged(level, regex, msg = nil)
         # Skip verifying logs that we're not supposed to send.
         return unless Puppet::Util::Log.sendlevel?(level)
@@ -38,7 +40,7 @@ module PuppetTest
         run_events(:rollback, trans, events, msg)
     end
 
-    def assert_events(events, *items)
+    def assert_events(events, *resources)
         trans = nil
         comp = nil
         msg = nil
@@ -46,56 +48,26 @@ module PuppetTest
         unless events.is_a? Array
             raise Puppet::DevError, "Incorrect call of assert_events"
         end
-        if items[-1].is_a? String
-            msg = items.pop
+        if resources[-1].is_a? String
+            msg = resources.pop
         end
 
-        remove_comp = false
-        # They either passed a comp or a list of items.
-        if items[0].is_a? Puppet.type(:component)
-            comp = items.shift
-        else
-            comp = newcomp(items[0].title, *items)
-            remove_comp = true
-        end
-        msg ||= comp.title
-        assert_nothing_raised("Component %s failed" % [msg]) {
-            trans = comp.evaluate
-        }
+        config = resources2catalog(*resources)
+        transaction = Puppet::Transaction.new(config)
 
-        run_events(:evaluate, trans, events, msg)
+        run_events(:evaluate, transaction, events, msg)
 
-        if remove_comp
-            Puppet.type(:component).delete(comp)
-        end
-
-        return trans
+        return transaction
     end
 
     # A simpler method that just applies what we have.
-    def assert_apply(*objects)
-        if objects[0].is_a?(Puppet.type(:component))
-            comp = objects.shift
-            unless objects.empty?
-                objects.each { |o| comp.push o }
-            end
-        else
-            comp = newcomp(*objects)
-        end
-        trans = nil
-
-        assert_nothing_raised("Failed to create transaction") {
-            trans = comp.evaluate
-        }
+    def assert_apply(*resources)
+        config = resources2catalog(*resources)
 
         events = nil
-        assert_nothing_raised("Failed to evaluate transaction") {
-            events = trans.evaluate.collect { |e| e.event }
+        assert_nothing_raised("Failed to evaluate") {
+            events = config.apply.events
         }
-        trans.cleanup
-        Puppet.type(:component).delete(comp)
         events
     end
 end
-
-# $Id$

data/test/lib/puppettest/support/collection.rb

@@ -27,4 +27,3 @@ module PuppetTest::Support::Collection
     end
 end
 
-# $Id: collection.rb 2742 2007-08-03 23:49:53Z luke $

data/test/lib/puppettest/support/helpers.rb

@@ -20,4 +20,3 @@ module PuppetTest
     end
 end
 
-# $Id$

data/test/lib/puppettest/support/resources.rb

@@ -4,34 +4,34 @@
 #  Copyright (c) 2006. All rights reserved.
 
 module PuppetTest::Support::Resources
-    def treefile(name)
-        Puppet::Type.type(:file).create :path => "/tmp/#{name}", :mode => 0755
+    def tree_resource(name)
+        Puppet::Type.type(:file).create :title => name, :path => "/tmp/#{name}", :mode => 0755
     end
     
-    def treecomp(name)
+    def tree_container(name)
         Puppet::Type::Component.create :name => name, :type => "yay"
     end
     
-    def treenode(name, *children)
-        comp = treecomp name
-        children.each do |c| 
-            if c.is_a?(String)
-                comp.push treefile(c)
-            else
-                comp.push c
+    def treenode(config, name, *resources)
+        comp = tree_container name
+        resources.each do |resource| 
+            if resource.is_a?(String)
+                resource = tree_resource(resource)
             end
+            config.add_edge!(comp, resource)
+            config.add_resource resource unless config.resource(resource.ref)
         end
         return comp
     end
     
     def mktree
-        one = treenode("one", "a", "b")
-        two = treenode("two", "c", "d")
-        middle = treenode("middle", "e", "f", two)
-        top = treenode("top", "g", "h", middle, one)
+        catalog = Puppet::Node::Catalog.new do |config|
+            one = treenode(config, "one", "a", "b")
+            two = treenode(config, "two", "c", "d")
+            middle = treenode(config, "middle", "e", "f", two)
+            top = treenode(config, "top", "g", "h", middle, one)
+        end
         
-        return one, two, middle, top
+        return catalog
     end
 end
-
-# $Id: resources.rb 1896 2006-12-01 04:11:11Z luke $