Merging the webserver_portability branch from version 2182 to version 2258.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2259 980ebf18-57e1-0310-9a29-db15c13687c0

5 files changed, 9 insertions, 20 deletions

diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb
index 80ac8c4e7..b58718112 100755
--- a/test/executables/puppetbin.rb
+++ b/test/executables/puppetbin.rb
@@ -2,9 +2,6 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/network/server'
-require 'puppet/sslcertificates'
 require 'puppettest'
 
 class TestPuppetBin < Test::Unit::TestCase
diff --git a/test/executables/puppetca.rb b/test/executables/puppetca.rb
index 028950762..21185df10 100755
--- a/test/executables/puppetca.rb
+++ b/test/executables/puppetca.rb
@@ -2,9 +2,6 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/network/server'
-require 'puppet/sslcertificates'
 require 'puppettest'
 
 class TestPuppetCA < Test::Unit::TestCase
@@ -16,7 +13,7 @@ class TestPuppetCA < Test::Unit::TestCase
     end
     
     def mkca
-        Puppet::Network::Server::CA.new()
+        Puppet::Network::Handler.ca.new()
     end
     
     def mkcert(hostname)
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb
index f8cb89ff6..220ff4283 100755
--- a/test/executables/puppetd.rb
+++ b/test/executables/puppetd.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/network/server'
+require 'puppet/network/client'
 require 'puppettest'
 require 'socket'
 require 'facter'
@@ -15,10 +15,10 @@ class TestPuppetDExe < Test::Unit::TestCase
         file = startmasterd
 
         # create the client
-        client = Puppet::Network::Client::MasterClient.new(:Server => "localhost", :Port => @@port)
+        client = Puppet::Network::Client.master.new(:Server => "localhost", :Port => @@port)
 
         # make a new fqdn
-        fqdn = client.fqdn.sub(/^\w+\./, "testing.")
+        fqdn = Puppet[:certname].sub(/^\w+\./, "testing.")
 
         cmd = "puppetd"
         cmd += " --verbose"
diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb
index 4563a0216..5195fa345 100755
--- a/test/executables/puppetmasterd.rb
+++ b/test/executables/puppetmasterd.rb
@@ -3,11 +3,9 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/network/server'
-require 'puppet/daemon'
+require 'puppet/network/client'
 require 'puppettest'
 require 'socket'
-require 'facter'
 
 class TestPuppetMasterD < Test::Unit::TestCase
     include PuppetTest::ExeTest
@@ -35,7 +33,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
 
         client = nil
         assert_nothing_raised() {
-            client = Puppet::Network::Client::StatusClient.new(
+            client = Puppet::Network::Client.status.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -47,14 +45,14 @@ class TestPuppetMasterD < Test::Unit::TestCase
 
         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
@@ -65,7 +63,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
 
         # this client shoulduse the same certs
         assert_nothing_raised() {
-            client = Puppet::Network::Client::MasterClient.new(
+            client = Puppet::Network::Client.master.new(
                 :Server => "localhost",
                 :Port => @@port
             )
diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb
index 83a20ec30..58ce11978 100755
--- a/test/executables/puppetmodule.rb
+++ b/test/executables/puppetmodule.rb
@@ -2,9 +2,6 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/network/server'
-require 'puppet/sslcertificates'
 require 'puppettest'
 
 class TestPuppetModule < Test::Unit::TestCase