test/executables/puppetmasterd.rb in puppet-0.18.4 vs test/executables/puppetmasterd.rb in puppet-0.22.4

@@ -1,21 +1,16 @@
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
+#!/usr/bin/env ruby
 
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+
 require 'puppet'
-require 'puppet/server'
-require 'puppet/daemon'
-require 'test/unit'
-require 'puppettest.rb'
+require 'puppet/network/client'
+require 'puppettest'
 require 'socket'
-require 'facter'
 
 class TestPuppetMasterD < Test::Unit::TestCase
-	include ExeTest
+    include PuppetTest::ExeTest
     def getcerts
         include Puppet::Daemon
         if self.readcerts
             return [@cert, @key, @cacert, @cacertfile]
         else
@@ -36,11 +31,11 @@
             socket.close
         }
 
         client = nil
         assert_nothing_raised() {
-            client = Puppet::Client::StatusClient.new(
+            client = Puppet::Network::Client.status.new(
                 :Server => "localhost",
                 :Port => @@port
             )
         }
 
@@ -48,29 +43,29 @@
         assert(Puppet[:autosign] =~ /^#{File::SEPARATOR}/,
             "Autosign is set to %s, not a file" % Puppet[:autosign])
 
         FileUtils.mkdir_p(File.dirname(Puppet[:autosign]))
         File.open(Puppet[:autosign], "w") { |f|
-            f.puts client.fqdn
+            f.puts Puppet[:certname]
         }
 
         retval = nil
 
         # init the client certs
         assert_nothing_raised() {
-            client.initcerts
+            client.cert
         }
 
         # call status
         assert_nothing_raised() {
             retval = client.status
         }
         assert_equal(1, retval, "Status.status return value was %s" % retval)
 
         # this client shoulduse the same certs
         assert_nothing_raised() {
-            client = Puppet::Client::MasterClient.new(
+            client = Puppet::Network::Client.master.new(
                 :Server => "localhost",
                 :Port => @@port
             )
         }
         assert_nothing_raised() {
@@ -99,11 +94,11 @@
 
         assert_nil(pid, "Puppetmasterd is still running after parseonly")
     end
 
     def disabled_test_sslconnection
-        #file = File.join($puppetbase, "examples", "code", "head")
+        #file = File.join(exampledir, "code", "head")
         #startmasterd("--manifest #{file}")
 
         #assert_nothing_raised {
         #    socket = TCPSocket.new("127.0.0.1", Puppet[:masterport])
         #    socket.close
@@ -143,6 +138,6 @@
         }
         #stopmasterd
     end
 end
 
-# $Id: puppetmasterd.rb 1304 2006-06-20 18:10:06Z luke $
+# $Id: puppetmasterd.rb 2259 2007-03-06 19:03:05Z luke $