puppet 0.24.9 → 0.25.0

data/test/lib/puppettest/certificates.rb

@@ -42,9 +42,9 @@ module PuppetTest::Certificates
             cert = Puppet::SSLCertificates::Certificate.new(:name => hostname)
             cert.mkcsr
         }
-        
+
         return cert
-    end 
+    end
 
     def mksignedcert(ca = nil, hostname = nil)
         ca ||= mkCA()

data/test/lib/puppettest/exetest.rb

@@ -58,7 +58,6 @@ module PuppetTest::ExeTest
         args += " --masterport %s" % @@port
         args += " --user %s" % Puppet::Util::SUIDManager.uid
         args += " --group %s" % Puppet::Util::SUIDManager.gid
-        args += " --nonodes"
         args += " --autosign true"
 
         #if Puppet[:debug]

data/test/lib/puppettest/fakes.rb

@@ -153,7 +153,7 @@ module PuppetTest
             end
 
             return ret
-        end 
+        end
 
         def store(hash)
             hash.each do |n, v|

data/test/lib/puppettest/parsertesting.rb

@@ -14,7 +14,7 @@ module PuppetTest::ParserTesting
         def evaluated?
             defined? @evaluated and @evaluated
         end
-        
+
         def evaluate(*args)
             @evaluated = true
             return @evaluate
@@ -25,7 +25,7 @@ module PuppetTest::ParserTesting
                 @evaluate = val
             end
         end
-        
+
         def reset
             @evaluated = nil
         end
@@ -33,8 +33,13 @@ module PuppetTest::ParserTesting
         def safeevaluate(*args)
             evaluate()
         end
+
+        def evaluate_match(othervalue, scope, options={})
+            value = evaluate()
+            othervalue == value
+        end
     end
-    
+
     def astarray(*args)
         AST::ASTArray.new(
             :children => args
@@ -65,7 +70,7 @@ module PuppetTest::ParserTesting
     def mkscope(hash = {})
         hash[:parser] ||= mkparser
         compiler ||= mkcompiler(hash[:parser])
-        compiler.topscope.source = (hash[:parser].findclass("", "") || hash[:parser].newclass(""))
+        compiler.topscope.source = (hash[:parser].find_hostclass("", "") || hash[:parser].newclass(""))
 
         unless compiler.topscope.source
             raise "Could not find source for scope"

data/test/lib/puppettest/railstesting.rb

@@ -26,7 +26,7 @@ module PuppetTest::RailsTesting
     def railsresource(type = "file", title = "/tmp/testing", params = {})
         railsteardown
         railsinit
-        
+
         # We need a host for resources
         #host = Puppet::Rails::Host.new(:name => Facter.value("hostname"))
 
@@ -39,12 +39,12 @@ module PuppetTest::RailsTesting
         facts = Facter.to_hash
 
         # Now try storing our crap
-        host = nil 
+        host = nil
         node = mknode(facts["hostname"])
         node.parameters = facts
         assert_nothing_raised {
             host = Puppet::Rails::Host.store(node, resources)
-        }        
+        }
 
         # Now save the whole thing
         host.save

data/test/lib/puppettest/servertest.rb

@@ -63,7 +63,7 @@ module PuppetTest::ServerTest
         @@tmppids << spid
 
         # give the server a chance to do its thing
-        sleep 1 
+        sleep 1
         return spid
     end
 

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

@@ -15,7 +15,7 @@ module PuppetTest
     def assert_uid_gid(uid, gid, filename)
         flunk "Must be uid 0 to run these tests" unless Process.uid == 0
 
-        fork do 
+        fork do
             Puppet::Util::SUIDManager.gid = gid
             Puppet::Util::SUIDManager.uid = uid
             # FIXME: use the tempfile method from puppettest.rb
@@ -30,7 +30,7 @@ module PuppetTest
 
         f = File.open(filename, "r")
 
-        a = f.readlines 
+        a = f.readlines
         assert_equal(uid, a[0].chomp.to_i, "UID was incorrect")
         assert_equal(gid, a[1].chomp.to_i, "GID was incorrect")
         FileUtils.rm(filename)

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

@@ -18,7 +18,7 @@ module PuppetTest::Support::Collection
                 query = nil
 
                 assert_nothing_raised("Could not parse '#{str}'") do
-                    query = parser.parse(code).classes[""].code[0].query
+                    query = parser.parse(code).hostclass("").code[0].query
                 end
 
                 yield str, res, query

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

@@ -5,16 +5,16 @@
 
 module PuppetTest::Support::Resources
     def tree_resource(name)
-        Puppet::Type.type(:file).create :title => name, :path => "/tmp/#{name}", :mode => 0755
+        Puppet::Type.type(:file).new :title => name, :path => "/tmp/#{name}", :mode => 0755
     end
-    
+
     def tree_container(name)
         Puppet::Type::Component.create :name => name, :type => "yay"
     end
-    
+
     def treenode(config, name, *resources)
         comp = tree_container name
-        resources.each do |resource| 
+        resources.each do |resource|
             if resource.is_a?(String)
                 resource = tree_resource(resource)
             end
@@ -23,15 +23,15 @@ module PuppetTest::Support::Resources
         end
         return comp
     end
-    
+
     def mktree
-        catalog = Puppet::Node::Catalog.new do |config|
+        catalog = Puppet::Resource::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 catalog
     end
 end

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

@@ -17,24 +17,24 @@ module PuppetTest::Support::Utils
         transport[:path] = path
         transport[:ensure] = "file"
         assert_nothing_raised {
-            file = transport.to_type
+            file = transport.to_ral
         }
     end
 
     # Turn a list of resources, or possibly a catalog and some resources,
     # into a catalog object.
     def resources2catalog(*resources)
-        if resources[0].is_a?(Puppet::Node::Catalog)
+        if resources[0].is_a?(Puppet::Resource::Catalog)
             config = resources.shift
             unless resources.empty?
                 resources.each { |r| config.add_resource r }
             end
-        elsif resources[0].is_a?(Puppet.type(:component))
+        elsif resources[0].is_a?(Puppet::Type.type(:component))
             raise ArgumentError, "resource2config() no longer accpts components"
             comp = resources.shift
             comp.delve
         else
-            config = Puppet::Node::Catalog.new
+            config = Puppet::Resource::Catalog.new
             resources.each { |res| config.add_resource res }
         end
         return config
@@ -42,12 +42,6 @@ module PuppetTest::Support::Utils
 
     # stop any services that might be hanging around
     def stopservices
-        if stype = Puppet::Type.type(:service)
-            stype.each { |service|
-                service[:ensure] = :stopped
-                service.evaluate
-            }
-        end
     end
 
     # TODO: rewrite this to use the 'etc' module.
@@ -70,15 +64,15 @@ module PuppetTest::Support::Utils
     def set_mygroup
         # retrieve the user name
         group = %x{groups}.chomp.split(/ /)[0]
-	unless group
-	    raise "Could not find group to set in @mygroup"
-	end
-	@mygroup = group
+        unless group
+            raise "Could not find group to set in @mygroup"
+        end
+        @mygroup = group
     end
 
     def run_events(type, trans, events, msg)
         case type
-        when :evaluate, :rollback: # things are hunky-dory
+        when :evaluate, :rollback # things are hunky-dory
         else
             raise Puppet::DevError, "Incorrect run_events type"
         end
@@ -165,7 +159,7 @@ module PuppetTest::Support::Utils
         else
             name = :testing
         end
-        config = Puppet::Node::Catalog.new :testing do |conf|
+        config = Puppet::Resource::Catalog.new :testing do |conf|
             resources.each { |resource| conf.add_resource resource }
         end
 

data/test/lib/puppettest/testcase.rb

@@ -5,9 +5,10 @@
 
 require 'puppettest'
 require 'puppettest/runnable_test'
+require 'test/unit'
 
 class PuppetTest::TestCase < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
     extend PuppetTest::RunnableTest
 
     def self.suite

data/test/network/authconfig.rb

@@ -7,7 +7,7 @@ require 'puppettest'
 require 'puppet/network/authconfig'
 
 class TestAuthConfig < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     def request(call, client, ip)
         r = Puppet::Network::ClientRequest.new(client, ip, false)

data/test/network/authorization.rb

@@ -7,7 +7,7 @@ require 'puppet/network/authorization'
 require 'mocha'
 
 class TestAuthConfig < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     # A mock class for authconfig
     class FakeAuth

data/test/network/authstore.rb

@@ -7,7 +7,7 @@ require 'mocha'
 require 'puppet/network/authstore'
 
 class TestAuthStore < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
     Declaration = Puppet::Network::AuthStore::Declaration
     def mkstore
         store = nil
@@ -53,10 +53,6 @@ class TestAuthStore < Test::Unit::TestCase
         #assert_raise(Puppet::AuthStoreError) {
         #    @store.allow("192.168.674.0")
         #}
-
-        assert_raise(Puppet::AuthStoreError) {
-            @store.allow("192.168.0")
-        }
     end
 
     def test_ipranges
@@ -124,7 +120,7 @@ class TestAuthStore < Test::Unit::TestCase
             %w{hostname.com 192.168.0.4},
             %w{localhost 192.168.0.1},
             %w{localhost 127.0.0.1}
-            
+
         ].each { |ary|
             assert(@store.allowed?(*ary), "Failed to allow %s" % [ary.join(",")])
         }
@@ -136,7 +132,7 @@ class TestAuthStore < Test::Unit::TestCase
                 "store did not return nil")
         end
         assert_equal([Declaration.new(:allow, "*.host.com")],
-            @store.send(:instance_variable_get, "@declarations"),
+                     @store.send(:instance_variable_get, "@declarations"),
             "Did not store declaration")
 
         # Now add another one and make sure it gets sorted appropriately
@@ -146,8 +142,8 @@ class TestAuthStore < Test::Unit::TestCase
         end
 
         assert_equal([
-            Declaration.new(:allow, "me.host.com"),
-            Declaration.new(:allow, "*.host.com")
+                     Declaration.new(:allow, "me.host.com"),
+                     Declaration.new(:allow, "*.host.com")
         ],
             @store.send(:instance_variable_get, "@declarations"),
             "Did not sort declarations")
@@ -186,10 +182,9 @@ class TestAuthStore < Test::Unit::TestCase
         }
 
         %w{
-            invalid
             ^invalid!
             inval$id
-        
+
         }.each { |pat|
             assert_raise(Puppet::AuthStoreError,
                 "name '%s' was allowed" % pat) {
@@ -266,10 +261,55 @@ class TestAuthStore < Test::Unit::TestCase
         assert(@store.allowed?("host.madstop.com", "192.168.0.1"),
             "More specific allowal by ip failed")
     end
+
+    def test_dynamic_backreferences
+        @store.allow("$1.madstop.com")
+
+        assert_nothing_raised { @store.interpolate([nil, "host"]) }
+        assert(@store.allowed?("host.madstop.com", "192.168.0.1"), "interpolation failed")
+        assert_nothing_raised { @store.reset_interpolation }
+    end
+
+    def test_dynamic_ip
+        @store.allow("192.168.0.$1")
+
+        assert_nothing_raised { @store.interpolate([nil, "12"]) }
+        assert(@store.allowed?("host.madstop.com", "192.168.0.12"), "interpolation failed")
+        assert_nothing_raised { @store.reset_interpolation }
+    end
+
+    def test_multiple_dynamic_backreferences
+        @store.allow("$1.$2")
+
+        assert_nothing_raised { @store.interpolate([nil, "host", "madstop.com"]) }
+        assert(@store.allowed?("host.madstop.com", "192.168.0.1"), "interpolation failed")
+        assert_nothing_raised { @store.reset_interpolation }
+    end
+
+    def test_multithreaded_allow_with_dynamic_backreferences
+        @store.allow("$1.madstop.com")
+
+        threads = []
+        9.times { |a|
+            threads << Thread.new {
+                9.times { |b|
+                Thread.pass
+                @store.interpolate([nil, "a#{b}", "madstop.com"])
+                Thread.pass
+                assert( @store.allowed?("a#{b}.madstop.com", "192.168.0.1") )
+                Thread.pass
+                @store.reset_interpolation
+                Thread.pass
+            }
+            }
+        }
+        threads.each { |th| th.join }
+    end
+
 end
 
 class TestAuthStoreDeclaration < PuppetTest::TestCase
-	include PuppetTest
+    include PuppetTest
     Declaration = Puppet::Network::AuthStore::Declaration
 
     def setup
@@ -292,7 +332,10 @@ class TestAuthStoreDeclaration < PuppetTest::TestCase
             "billy.Hostname.COM" => [:domain, %w{com hostname billy}, nil],
             "billy-jean.Hostname.COM" => [:domain, %w{com hostname billy-jean}, nil],
             "*.hostname.COM" => [:domain, %w{com hostname}, 2],
-            "*.hostname.COM" => [:domain, %w{com hostname}, 2]
+            "*.hostname.COM" => [:domain, %w{com hostname}, 2],
+            "$1.hostname.COM" => [:dynamic, %w{com hostname $1}, nil],
+            "192.168.$1.$2" => [:dynamic, %w{$2 $1 168 192}, nil],
+            "8A5BC90C-B8FD-4CBC-81DA-BAD84D551791" => [:opaque, %w{8A5BC90C-B8FD-4CBC-81DA-BAD84D551791}, nil]
         }.each do |input, output|
 
             # Create a new decl each time, so values aren't cached.
@@ -306,7 +349,7 @@ class TestAuthStoreDeclaration < PuppetTest::TestCase
             end
         end
 
-        %w{192.168 hostname -hostname.com hostname.*}.each do |input|
+        %w{-hostname.com hostname.*}.each do |input|
             assert_raise(Puppet::AuthStoreError, "Did not fail on %s" % input) do
                 @decl.pattern = input
             end

data/test/network/client/ca.rb

@@ -36,6 +36,7 @@ class TestClientCA < Test::Unit::TestCase
         Puppet.settings.stubs(:value).with(:http_proxy_host).returns(nil)
         Puppet.settings.stubs(:value).with(:http_proxy_port).returns(nil)
         Puppet.settings.stubs(:value).with(:http_keepalive).returns(false)
+        Puppet.settings.stubs(:value).with(:configtimeout).returns(180)
 
         # Just throw an error; the important thing is the values, not what happens next.
         Net::HTTP.stubs(:new).with("myca", 321, nil, nil).raises(ArgumentError)

data/test/network/client/resource.rb

@@ -11,6 +11,12 @@ class TestResourceClient < Test::Unit::TestCase
     include PuppetTest::ServerTest
     include PuppetTest::Support::Utils
 
+    def setup
+        super
+
+        Puppet::Type.type(:user).provider(:directoryservice).stubs(:get_macosx_version_major).returns "10.5"
+    end
+
     def mkresourceserver
         Puppet::Network::Handler.resource.new
     end
@@ -29,62 +35,18 @@ class TestResourceClient < Test::Unit::TestCase
         client = mkclient()
 
         # Test describing
-        tobj = nil
-        assert_nothing_raised {
-            tobj = client.describe("file", file)
-        }
+        tresource = client.describe("file", file)
 
-        assert(tobj, "Did not get response")
+        assert(tresource, "Did not get response")
 
-        assert_instance_of(Puppet::TransObject, tobj)
+        assert_instance_of(Puppet::TransObject, tresource)
 
-        Puppet::Type.allclear
-        obj = nil
-        assert_nothing_raised {
-            obj = tobj.to_type
-        }
-        assert_events([], obj)
-        File.unlink(file)
-        assert_events([:file_created], obj)
-        File.unlink(file)
+        resource = tresource.to_ral
+        assert_equal(File.stat(file).mode & 007777, resource[:mode], "Did not get mode")
 
         # Now test applying
-        Puppet::Type.allclear
-        result = nil
-        assert_nothing_raised {
-            result = client.apply(tobj)
-        }
+        result = client.apply(tresource)
         assert(FileTest.exists?(file), "File was not created on apply")
-
-        # Lastly, test "list"
-        Puppet::Type.allclear
-        list = nil
-        assert_nothing_raised {
-            list = client.list("user")
-        }
-
-        assert_instance_of(Puppet::TransBucket, list)
-
-        count = 0
-        list.each do |tobj|
-            break if count > 3
-            assert_instance_of(Puppet::TransObject, tobj)
-
-            Puppet::Type.allclear
-            tobj2 = nil
-            assert_nothing_raised {
-                tobj2 = client.describe(tobj.type, tobj.name)
-            }
-
-            obj = nil
-            Puppet::Type.allclear
-            assert_nothing_raised {
-                obj = tobj2.to_type
-            }
-            assert_events([], obj)
-
-            count += 1
-        end
     end
 end