Converting to using the Rakefile for testing. The old 'test' script is

now deprecated, and I'll send an email to the dev list and update the
docs to reflect that.

This still isn't the final solution, because the module structure is a
bit weird, but at least it's a starting point, and everything from here
on out is small changes, as opposed to large architectural changes.



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

1 files changed, 2 insertions, 9 deletions

diff --git a/test/server/server.rb b/test/server/server.rb
index e279d8440..681fa1f42 100644
--- a/test/server/server.rb
+++ b/test/server/server.rb
@@ -1,13 +1,6 @@
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/server'
-require 'test/unit'
-require 'puppettest.rb'
+require 'puppettest'
 
 # $Id$
 
@@ -18,7 +11,7 @@ else
 end
 
 class TestServer < Test::Unit::TestCase
-	include ServerTest
+    include PuppetTest::ServerTest
 
     # test that we can connect to the server
     # we have to use fork here, because we apparently can't use threads