puppet 0.18.4 → 0.22.4

data/test/{client/pelement.rb → network/client/resource.rb}

@@ -1,45 +1,27 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $puppetbase = "../.."
-end
-
-require 'puppet'
-require 'puppet/client/pelement'
-require 'puppet/server'
-require 'test/unit'
-require 'puppettest.rb'
+#!/usr/bin/env ruby
 
-# $Id: pelement.rb 1144 2006-04-28 04:08:32Z luke $
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-class TestPElementClient < Test::Unit::TestCase
-	include ServerTest
+require 'puppettest'
+require 'puppet/network/client/resource'
 
-    def mkpelementserver
-        handlers = {
-            :CA => {}, # so that certs autogenerate
-            :PElement => {},
-        }
+class TestResourceClient < Test::Unit::TestCase
+    include PuppetTest::ServerTest
 
-        return mkserver(handlers)
+    def mkresourceserver
+        Puppet::Network::Handler.resource.new
     end
 
     def mkclient
-        client = nil
-        assert_nothing_raised {
-            client = Puppet::Client::PElement.new(:Server => "localhost",
-                :Port => @@port)
-        }
-
-        return client
+        client = Puppet::Network::Client.resource.new(:Resource => mkresourceserver)
     end
 
-    def test_pelements
+    def test_resources
         file = tempfile()
         text = "yayness\n"
         File.open(file, "w") { |f| f.print text }
 
-        mkpelementserver()
+        mkresourceserver()
 
         client = mkclient()
 
@@ -97,3 +79,5 @@ class TestPElementClient < Test::Unit::TestCase
         end
     end
 end
+
+# $Id: resource.rb 2259 2007-03-06 19:03:05Z luke $

data/test/network/client_request.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+
+require 'puppettest'
+
+require 'puppet/network/client_request'
+
+class TestClientRequest < Test::Unit::TestCase
+	include PuppetTest
+
+    def test_initialize
+        req = nil
+        assert_nothing_raised do
+            req = Puppet::Network::ClientRequest.new("name", "ip", false)
+        end
+
+        assert_equal("name", req.name, "host name was not set correctly")
+        assert_equal("ip", req.ip, "host ip was not set correctly")
+        assert_equal(false, req.authenticated, "host auth was not set correctly")
+        assert(! req.authenticated, "host was incorrectly considered authenticated")
+
+        req.authenticated = true
+        assert(req.authenticated, "host was not considered authenticated")
+
+        assert_raise(ArgumentError) do
+            req.call
+        end
+
+        req.handler = "yay"
+        req.method = "foo"
+        assert_equal("yay.foo", req.call, "call was not built correctly")
+
+        assert_equal("name(ip)", req.to_s, "request string not correct")
+    end
+end
+
+# $Id: client_request.rb 2259 2007-03-06 19:03:05Z luke $
+

data/test/network/daemon.rb

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+
+$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+
+require 'puppettest'
+require 'puppet/daemon'
+
+class TestDaemon < Test::Unit::TestCase
+	include PuppetTest
+
+    class FakeDaemon
+        include Puppet::Daemon
+    end
+
+    def test_pidfile
+        daemon = FakeDaemon.new
+
+        assert_nothing_raised("removing non-existent file failed") do
+            daemon.rmpidfile
+        end
+
+        Puppet[:pidfile] = tempfile()
+        assert_nothing_raised "could not lock" do
+            daemon.setpidfile
+        end
+
+        assert(FileTest.exists?(daemon.pidfile),
+            "did not create pidfile")
+
+        assert_nothing_raised("removing non-existent file failed") do
+            daemon.rmpidfile
+        end
+
+        assert(! FileTest.exists?(daemon.pidfile),
+            "did not remove pidfile")
+    end
+
+    def test_daemonize
+        daemon = FakeDaemon.new
+        Puppet[:pidfile] = tempfile()
+
+        exiter = tempfile()
+
+        assert_nothing_raised("Could not fork and daemonize") do
+            fork do
+                daemon.send(:daemonize)
+                # Wait a max of 5 secs
+                50.times do
+                    if FileTest.exists?(exiter)
+                        daemon.rmpidfile
+                        exit(0)
+                    end
+                    sleep 0.1
+                end
+                exit(0)
+            end
+        end
+        sleep(0.1)
+        assert(FileTest.exists?(Puppet[:pidfile]),
+            "did not create pidfile on daemonize")
+
+        File.open(exiter, "w") { |f| f.puts "" }
+
+        sleep(0.2)
+        assert(! FileTest.exists?(Puppet[:pidfile]),
+            "did not remove pidfile on process death")
+    end
+end
+
+# $Id: daemon.rb 2259 2007-03-06 19:03:05Z luke $
+

data/test/{server → network/handler}/bucket.rb

@@ -1,19 +1,13 @@
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-    $debug = true
-else
-    $debug = false
-end
+#!/usr/bin/env ruby
+
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'test/unit'
-require 'puppettest.rb'
+require 'puppettest'
+require 'puppet/network/handler/filebucket'
 require 'base64'
 
 class TestBucket < Test::Unit::TestCase
-	include ServerTest
+    include PuppetTest::ServerTest
 
     def out
         if defined? @num
@@ -29,8 +23,6 @@ class TestBucket < Test::Unit::TestCase
     # run through all of the files and exercise the filebucket methods
     def checkfiles(client)
         files = filelist()
-        #files = %w{/usr/local/bin/vim /etc/motd /etc/motd /etc/motd /etc/motd}
-        #files = %w{/usr/local/bin/vim}
 
         # iterate across all of the files
         files.each { |file|
@@ -54,11 +46,11 @@ class TestBucket < Test::Unit::TestCase
             tsum = nil
             nsum = nil
             out
-            assert_nothing_raised {
+            assert_nothing_raised("Could not back up file") {
                 osum = client.backup(file)
             }
             out
-            assert_nothing_raised {
+            assert_nothing_raised("Could not back up second file") {
                 tsum = client.backup(tmppath)
             }
             out
@@ -155,8 +147,8 @@ class TestBucket < Test::Unit::TestCase
         files = filelist()
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server::FileBucket.new(
-                :Bucket => @bucket
+            server = Puppet::Network::Handler.filebucket.new(
+                :Path => @bucket
             )
         }
 
@@ -194,14 +186,14 @@ class TestBucket < Test::Unit::TestCase
         client = nil
         threads = []
         assert_nothing_raised {
-            bucket = Puppet::Server::FileBucket.new(
-                :Bucket => @bucket
+            bucket = Puppet::Network::Handler.filebucket.new(
+                :Path => @bucket
             )
         }
 
         #sleep(30)
         assert_nothing_raised {
-            client = Puppet::Client::Dipper.new(
+            client = Puppet::Network::Client.dipper.new(
                 :Bucket => bucket
             )
         }
@@ -222,10 +214,10 @@ class TestBucket < Test::Unit::TestCase
         client = nil
         port = Puppet[:masterport]
 
-        pid = mkserver(:CA => {}, :FileBucket => { :Bucket => @bucket})
+        pid = mkserver(:CA => {}, :FileBucket => { :Path => @bucket})
 
         assert_nothing_raised {
-            client = Puppet::Client::Dipper.new(
+            client = Puppet::Network::Client.dipper.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -242,8 +234,8 @@ class TestBucket < Test::Unit::TestCase
     def test_no_path_duplicates
         bucket = nil
         assert_nothing_raised {
-            bucket = Puppet::Server::FileBucket.new(
-                :Bucket => @bucket
+            bucket = Puppet::Network::Handler.filebucket.new(
+                :Path => @bucket
             )
         }
 
@@ -255,12 +247,96 @@ class TestBucket < Test::Unit::TestCase
             bucket.addfile("yayness", "/my/file")
         }
 
-        pathfile = File.join(bucket.path, sum, "paths")
+        a, b, pathfile = bucket.class.paths(bucket.path, sum)
 
         assert(FileTest.exists?(pathfile), "No path file at %s" % pathfile)
 
         assert_equal("/my/file\n", File.read(pathfile))
     end
+
+    # #447 -- a flat file structure just won't suffice.
+    def test_deeper_filestructure
+        bucket = Puppet::Network::Handler.filebucket.new(:Path => @bucket)
+
+        text = "this is some text"
+        md5 = Digest::MD5.hexdigest(text)
+
+        olddir = File.join(@bucket, md5)
+        FileUtils.mkdir_p(olddir)
+        oldcontent = File.join(olddir, "contents")
+        File.open(oldcontent, "w") { |f| f.print text }
+
+        result = nil
+        assert_nothing_raised("Could not retrieve content from old structure") do
+            result = bucket.getfile(md5)
+        end
+        assert_equal(text, result, "old-style content is wrong")
+
+        text = "and this is some new text"
+        md5 = Digest::MD5.hexdigest(text)
+
+        dirs = File.join(md5[0..7].split(""))
+        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(File.join(dir, "contents"), contents,
+            "content path is not the deeper version")
+        assert_equal(File.join(dir, "paths"), paths,
+            "paths file path is not the deeper version")
+
+        # Store our new text and make sure it gets stored in the new location
+        path = "/some/fake/path"
+        assert_nothing_raised("Could not store text") do
+            bucket.addfile(text, path)
+        end
+        assert(FileTest.exists?(contents), "did not create content file")
+        assert_equal(text, File.read(contents), "content is not right")
+        assert(FileTest.exists?(paths), "did not create paths file")
+        assert(File.read(paths).include?(path), "paths file does not contain path")
+
+        # And make sure we get it back out again
+        assert_nothing_raised("Could not retrieve new-style content") do
+            result = bucket.getfile(md5)
+        end
+        assert_equal(text, result, "did not retrieve new content correctly")
+    end
+
+    def test_add_path
+        bucket = Puppet::Network::Handler.filebucket.new(:Path => @bucket)
+
+        file = tempfile()
+
+        assert(! FileTest.exists?(file), "file already exists")
+
+        path = "/some/thing"
+        assert_nothing_raised("Could not add path") do
+            bucket.send(:add_path, path, file)
+        end
+        assert_equal(path + "\n", File.read(file), "path was not added")
+
+        assert_nothing_raised("Could not add path second time") do
+            bucket.send(:add_path, path, file)
+        end
+        assert_equal(path + "\n", File.read(file), "path was duplicated")
+
+        # Now try a new path
+        newpath = "/another/path"
+        assert_nothing_raised("Could not add path second time") do
+            bucket.send(:add_path, newpath, file)
+        end
+        text = [path, newpath].join("\n") + "\n"
+        assert_equal(text, File.read(file), "path was duplicated")
+
+        assert_nothing_raised("Could not add path third time") do
+            bucket.send(:add_path, path, file)
+        end
+        assert_equal(text, File.read(file), "path was duplicated")
+        assert_nothing_raised("Could not add second path second time") do
+            bucket.send(:add_path, newpath, file)
+        end
+        assert_equal(text, File.read(file), "path was duplicated")
+    end
 end
 
-# $Id: bucket.rb 1392 2006-07-11 20:58:25Z luke $
+# $Id: bucket.rb 2348 2007-03-24 21:16:20Z luke $

data/test/{server → network/handler}/ca.rb

@@ -1,17 +1,9 @@
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
+#!/usr/bin/env ruby
 
-require 'puppet'
-require 'puppet/server/ca'
-require 'puppet/sslcertificates'
-require 'openssl'
-require 'test/unit'
-require 'puppettest.rb'
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-# $Id: ca.rb 1304 2006-06-20 18:10:06Z luke $
+require 'puppettest'
+require 'puppet/network/handler/ca'
 
 if ARGV.length > 0 and ARGV[0] == "short"
     $short = true
@@ -20,7 +12,7 @@ else
 end
 
 class TestCA < Test::Unit::TestCase
-	include ServerTest
+    include PuppetTest::ServerTest
     # Verify that we're autosigning.  We have to autosign a "different" machine,
     # since we always autosign the CA server's certificate.
     def test_autocertgeneration
@@ -28,7 +20,7 @@ class TestCA < Test::Unit::TestCase
 
         # create our ca
         assert_nothing_raised {
-            ca = Puppet::Server::CA.new(:autosign => true)
+            ca = Puppet::Network::Handler.ca.new(:autosign => true)
         }
 
         # create a cert with a fake name
@@ -84,7 +76,7 @@ class TestCA < Test::Unit::TestCase
 
         # make our CA server
         assert_nothing_raised {
-            caserv = Puppet::Server::CA.new(:autosign => false)
+            caserv = Puppet::Network::Handler.ca.new(:autosign => false)
         }
 
         # retrieve the actual ca object
@@ -162,7 +154,7 @@ class TestCA < Test::Unit::TestCase
 
         caserv = nil
         assert_nothing_raised {
-            caserv = Puppet::Server::CA.new(:autosign => autosign)
+            caserv = Puppet::Network::Handler.ca.new(:autosign => autosign)
         }
 
         # make sure we know what's going on
@@ -176,7 +168,7 @@ class TestCA < Test::Unit::TestCase
     def test_nodefaultautosign
         caserv = nil
         assert_nothing_raised {
-            caserv = Puppet::Server::CA.new()
+            caserv = Puppet::Network::Handler.ca.new()
         }
 
         # make sure we know what's going on
@@ -190,8 +182,9 @@ class TestCA < Test::Unit::TestCase
     # the puppetmasterd CA does not autostart.
     def test_caautosign
         server = nil
+        Puppet[:name] = "puppetmasterd"
         assert_nothing_raised {
-            server = Puppet::Server.new(
+            server = Puppet::Network::Server::WEBrick.new(
                 :Port => @@port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
@@ -205,7 +198,7 @@ class TestCA < Test::Unit::TestCase
     def test_autosign_true_beats_file
         caserv = nil
         assert_nothing_raised {
-            caserv = Puppet::Server::CA.new()
+            caserv = Puppet::Network::Handler.ca.new()
         }
 
         host = "hostname.domain.com"
@@ -237,3 +230,5 @@ class TestCA < Test::Unit::TestCase
         assert(! caserv.autosign?("other.yay.com"), "Host was autosigned")
     end
 end
+
+# $Id: ca.rb 2259 2007-03-06 19:03:05Z luke $