puppet 0.24.9 → 0.25.0

data/test/network/client_request.rb

@@ -7,7 +7,7 @@ require 'puppettest'
 require 'puppet/network/client_request'
 
 class TestClientRequest < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     def test_initialize
         req = nil

data/test/network/handler/bucket.rb

@@ -106,7 +106,7 @@ class TestBucket < Test::Unit::TestCase
         end
 
         %w{
-            who bash sh uname /etc/passwd /etc/syslog.conf /etc/hosts 
+            who bash sh uname /etc/passwd /etc/syslog.conf /etc/hosts
         }.each { |file|
             # if it's fully qualified, just add it
             if file =~ /^\//
@@ -251,7 +251,7 @@ class TestBucket < Test::Unit::TestCase
         dir = File.join(@bucket, dirs, md5)
         filedir, contents, paths = bucket.class.paths(@bucket, md5)
 
-        assert_equal(dir, filedir, "did not use a deeper file structure") 
+        assert_equal(dir, filedir, "did not use a deeper file structure")
         assert_equal(File.join(dir, "contents"), contents,
             "content path is not the deeper version")
         assert_equal(File.join(dir, "paths"), paths,

data/test/network/handler/fileserver.rb

@@ -6,7 +6,7 @@ require 'puppettest'
 require 'puppet/network/handler/fileserver'
 
 class TestFileServer < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     def mkmount(path = nil)
         mount = nil
@@ -50,7 +50,7 @@ class TestFileServer < Test::Unit::TestCase
                 File.open(name, "w") { |f|
                     f.puts rand(100)
                 }
-                
+
                 name
             }
 
@@ -146,10 +146,6 @@ class TestFileServer < Test::Unit::TestCase
             list = server.list(sfile, :manage, true, false)
         }
 
-        assert_nothing_raised {
-            file = Puppet.type(:file)[tmpfile]
-        }
-
         output = "/\tfile"
 
         # verify it got listed as a file
@@ -467,7 +463,7 @@ class TestFileServer < Test::Unit::TestCase
 
         File.open(conffile, "w") { |f|
             f.print "# a test config file
- 
+
 [thing]
     path #{basedir}/thing
     allow 192.168.0.*
@@ -485,7 +481,7 @@ class TestFileServer < Test::Unit::TestCase
 
 "
         }
-        
+
 
         # create a server with the file
         assert_nothing_raised {
@@ -548,13 +544,13 @@ class TestFileServer < Test::Unit::TestCase
                     host, ip = sub
 
                     case type
-                    when :deny:
+                    when :deny
                         assert_raise(Puppet::AuthorizationError,
                             "Host %s, ip %s, allowed %s" %
                             [host, ip, mount]) {
                                 list = server.list(mount, :manage, true, false, host, ip)
                         }
-                    when :allow:
+                    when :allow
                         assert_nothing_raised("Host %s, ip %s, denied %s" %
                             [host, ip, mount]) {
                                 list = server.list(mount, :manage, true, false, host, ip)
@@ -597,7 +593,7 @@ class TestFileServer < Test::Unit::TestCase
             File.open(conffile, "w") { |f|
                 f.print text
             }
-            
+
 
             # create a server with the file
             server = nil
@@ -618,7 +614,7 @@ class TestFileServer < Test::Unit::TestCase
             File.open(conffile, "w") { |f|
                 f.print text
             }
-            
+
 
             # create a server with the file
             server = nil
@@ -642,13 +638,13 @@ class TestFileServer < Test::Unit::TestCase
         files = mktestfiles(dir)
         File.open(conffile, "w") { |f|
             f.print "# a test config file
- 
+
 [thing]
     path #{dir}
     allow test1.domain.com
 "
         }
-        
+
         # Reset the timeout, so we reload faster
         Puppet[:filetimeout] = 0.5
 
@@ -675,13 +671,13 @@ class TestFileServer < Test::Unit::TestCase
         sleep 1
         File.open(conffile, "w") { |f|
             f.print "# a test config file
- 
+
 [thing]
     path #{dir}
     allow test2.domain.com
 "
         }
-        
+
         assert_raise(Puppet::AuthorizationError, "List allowed invalid host") {
             list = server.list("/thing/", :manage, false, false,
                 "test1.domain.com", "127.0.0.1")
@@ -777,12 +773,12 @@ class TestFileServer < Test::Unit::TestCase
             client1_hostdir => "client1\n",
             client2_fqdndir => client2 + "\n"
         }
-        [fsdir, hostdir, fqdndir, 
+        [fsdir, hostdir, fqdndir,
          client1_hostdir, client2_fqdndir].each { |d|  Dir.mkdir(d) }
-        
+
         [client1_hostdir, client2_fqdndir].each do |d|
-            File.open(File.join(d, "file.txt"), "w") do |f| 
-                f.print contents[d] 
+            File.open(File.join(d, "file.txt"), "w") do |f|
+                f.print contents[d]
             end
         end
         conffile = tempfile()
@@ -950,7 +946,7 @@ allow *
              result = check.call(client, pat, repl)
          end
 
-        # Now, check that they use Facter info 
+        # Now, check that they use Facter info
         Puppet.notice "The following messages are normal"
         client = nil
         Facter.stubs(:value).with(:ipaddress).returns("127.0.0.1")

data/test/network/handler/master.rb

@@ -13,17 +13,17 @@ class TestMaster < Test::Unit::TestCase
         @master = Puppet::Network::Handler.master.new(:Manifest => tempfile)
 
         @catalog = stub 'catalog', :extract => ""
-        Puppet::Node::Catalog.stubs(:find).returns(@catalog)
+        Puppet::Resource::Catalog.stubs(:find).returns(@catalog)
     end
 
     def teardown
         super
-        Puppet::Indirector::Indirection.clear_cache
+        Puppet::Util::Cacher.expire
     end
 
     def test_freshness_is_always_now
         now1 = mock 'now1'
-        Time.expects(:now).returns(now1)
+        Time.stubs(:now).returns(now1)
 
         now1.expects(:to_i).returns 10
 
@@ -53,7 +53,7 @@ class TestMaster < Test::Unit::TestCase
 
         @master.stubs(:decode_facts)
 
-        Puppet::Node::Catalog.expects(:find).with("foo.com").returns(@catalog)
+        Puppet::Resource::Catalog.expects(:find).with("foo.com").returns(@catalog)
 
         @master.getconfig("facts", "yaml", "foo.com")
     end
@@ -68,7 +68,7 @@ class TestMasterFormats < Test::Unit::TestCase
         @master.stubs(:decode_facts)
 
         @catalog = stub 'catalog', :extract => ""
-        Puppet::Node::Catalog.stubs(:find).returns(@catalog)
+        Puppet::Resource::Catalog.stubs(:find).returns(@catalog)
     end
 
     def test_marshal_can_be_used

data/test/network/handler/report.rb

@@ -7,11 +7,11 @@ require 'puppet/network/handler/report'
 require 'puppettest/reporttesting'
 
 class TestReportServer < Test::Unit::TestCase
-	include PuppetTest
-	include PuppetTest::Reporttesting
+    include PuppetTest
+    include PuppetTest::Reporttesting
 
     Report = Puppet::Network::Handler.report
-	Puppet::Util.logmethods(self)
+    Puppet::Util.logmethods(self)
 
     def mkserver
         server = nil

data/test/network/handler/resource.rb

@@ -13,10 +13,9 @@ class TestResourceServer < Test::Unit::TestCase
 
     def verify_described(type, described)
         described.each do |name, trans|
-            type.clear
             obj = nil
             assert_nothing_raised do
-                obj = trans.to_type
+                obj = trans.to_ral
             end
 
             assert(obj, "Could not create object")
@@ -28,7 +27,6 @@ class TestResourceServer < Test::Unit::TestCase
                 assert_equal(Puppet::Type.type(:package).defaultprovider.name, obj[:provider])
             end
         end
-        type.clear
     end
 
     def test_describe_file
@@ -42,71 +40,38 @@ class TestResourceServer < Test::Unit::TestCase
             server = Puppet::Network::Handler.resource.new()
         end
 
-        # The first run we create the file on the copy, the second run
-        # the file is already there so the object should be in sync
-        2.times do |i|
-            [   [nil],
-                [[:content, :mode], []],
-                [[], [:content]],
-                [[:content], [:mode]]
-            ].each do |ary|
-                retrieve = ary[0] || []
-                ignore = ary[1] || []
-
-                File.open(file, "w") { |f| f.print str }
-
-                result = nil
-                assert_nothing_raised do
-                    result = server.describe("file", file, *ary)
-                end
-
-                assert(result, "Could not retrieve file information")
-
-                assert_instance_of(Puppet::TransObject, result)
+        [   [nil],
+            [[:content, :mode], []],
+            [[], [:content]],
+            [[:content], [:mode]]
+        ].each do |ary|
+            retrieve = ary[0] || []
+            ignore = ary[1] || []
 
-                # Now we have to clear, so that the server's object gets removed
-                Puppet::Type.type(:file).clear
+            File.open(file, "w") { |f| f.print str }
 
-                # And remove the file, so we can verify it gets recreated
-                if i == 0
-                    File.unlink(file)
-                end
-
-                object = nil
-                assert_nothing_raised do
-                    object = result.to_type
-                end
+            result = nil
+            assert_nothing_raised do
+                result = server.describe("file", file, *ary)
+            end
 
-                assert(object, "Could not create type")
+            assert(result, "Could not retrieve file information")
 
-                retrieve.each do |property|
-                    assert(object.should(property), "Did not retrieve %s" % property)
-                end
+            assert_instance_of(Puppet::TransObject, result)
 
-                ignore.each do |property|
-                    assert(! object.should(property), "Incorrectly retrieved %s" % property)
-                end
+            object = nil
+            assert_nothing_raised do
+                object = result.to_ral
+            end
 
-                if i == 0
-                    assert_events([:file_created], object)
-                else
-                    assert_nothing_raised {
-                        assert(object.insync?(object.retrieve), "Object was not in sync")
-                    }
-                end
+            assert(object, "Could not create type")
 
-                assert(FileTest.exists?(file), "File did not get recreated")
+            retrieve.each do |property|
+                assert(object.should(property), "Did not retrieve %s" % property)
+            end
 
-                if i == 0
-                if object.should(:content)
-                    assert_equal(str, File.read(file), "File contents are not the same")
-                else
-                    assert_equal("", File.read(file), "File content was incorrectly made")
-                end
-                end
-                if FileTest.exists? file
-                    File.unlink(file)
-                end
+            ignore.each do |property|
+                assert(! object.should(property), "Incorrectly retrieved %s" % property)
             end
         end
     end
@@ -140,17 +105,16 @@ class TestResourceServer < Test::Unit::TestCase
 
             assert_instance_of(Puppet::TransObject, result)
 
-            # Now we have to clear, so that the server's object gets removed
-            Puppet::Type.type(:file).clear
-
             # And remove the file, so we can verify it gets recreated
             Dir.rmdir(file)
 
             object = nil
             assert_nothing_raised do
-                object = result.to_type
+                object = result.to_ral
             end
 
+            catalog = mk_catalog(object)
+
             assert(object, "Could not create type")
 
             retrieve.each do |property|
@@ -160,11 +124,6 @@ class TestResourceServer < Test::Unit::TestCase
             ignore.each do |property|
                 assert(! object.should(property), "Incorrectly retrieved %s" % property)
             end
-
-            #assert_apply(object)
-            assert_events([:directory_created], object)
-            assert(FileTest.directory?(file), "Directory did not get recreated")
-            Dir.rmdir(file)
         end
     end
 
@@ -198,8 +157,6 @@ class TestResourceServer < Test::Unit::TestCase
                 bucket = server.list(type.name)
             }
 
-            #type.clear
-
             count = 0
             described = {}
             bucket.each do |obj|
@@ -251,10 +208,8 @@ class TestResourceServer < Test::Unit::TestCase
             filetrans = server.describe("file", file)
         }
 
-        Puppet::Type.type(:file).clear
-
         bucket = Puppet::TransBucket.new
-        bucket.type = "file"
+        bucket.type = "class"
         bucket.name = "test"
         bucket.push filetrans
 
@@ -273,7 +228,6 @@ class TestResourceServer < Test::Unit::TestCase
             yaml = Base64.encode64(YAML::dump(bucket))
         }
 
-        Puppet::Type.type(:file).clear
         File.unlink(file)
 
         if Base64.decode64(yaml) =~ /(.{20}Loglevel.{20})/

data/test/network/handler/runner.rb

@@ -3,68 +3,18 @@
 require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppet/network/handler/runner'
 
 class TestHandlerRunner < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
-    def mkclient(code)
-        master = nil
-        client = nil
-        Puppet[:code] = code
-        # create our master
-        assert_nothing_raised() {
-            # this is the default server setup
-            master = Puppet::Network::Handler.master.new(
-                :Local => true
-            )
-        }
+    def test_it_calls_agent_runner
+        runner = mock 'runner'
+        Puppet::Agent::Runner.expects(:new).with(:tags => "mytags", :ignoreschedules => true, :background => false).returns runner
+        runner.expects(:run)
+        runner.expects(:status).returns "yay"
 
-        # and our client
-        assert_nothing_raised() {
-            client = Puppet::Network::Client.master.new(
-                :Master => master
-            )
-        }
 
-        client
-    end
-
-    def setup
-        super
-        FileUtils.mkdir_p(Puppet[:statedir])
-        Puppet[:ignoreschedules] = false
-        # Okay, make our manifest
-        file = tempfile()
-        created = tempfile()
-        # We specify the schedule here, because I was having problems with
-        # using default schedules.
-        @code = %{
-                class yayness {
-                    schedule { "yayness": period => weekly }
-                    file { "#{created}": ensure => file, schedule => yayness }
-                }
-
-                include yayness
-            }
-
-        @client = mkclient(@code)
-
-        @runner = Puppet::Network::Handler.runner.new
-    end
-
-    def test_runner_when_in_foreground
-        @client.expects(:run).with(:tags => "mytags", :ignoreschedules => true)
-
-        Process.expects(:newthread).never
-
-        @runner.run("mytags", true, true)
-    end
-
-    def test_runner_when_in_background
-        @client.expects(:run).with(:tags => "mytags", :ignoreschedules => true)
-
-        Puppet.expects(:newthread).yields
-
-        @runner.run("mytags", true, false)
+        assert_equal("yay", Puppet::Network::Handler.runner.new.run("mytags", true, true))
     end
 end