From 3891f48119ea01d04d7495cf2f07a9ddb37b2afc Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Tue, 19 Sep 2006 18:04:20 +0000
Subject: 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
---
 test/client/client.rb   | 15 ++++-----------
 test/client/master.rb   | 11 ++---------
 test/client/pelement.rb | 11 ++---------
 3 files changed, 8 insertions(+), 29 deletions(-)

(limited to 'test/client')

diff --git a/test/client/client.rb b/test/client/client.rb
index fa382392e..7d02f7acf 100644
--- a/test/client/client.rb
+++ b/test/client/client.rb
@@ -1,19 +1,10 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/client'
 require 'puppet/server'
-require 'test/unit'
-require 'puppettest.rb'
-
-# $Id$
+require 'puppettest'
 
 class TestClient < Test::Unit::TestCase
-	include ServerTest
+    include PuppetTest::ServerTest
     # a single run through of connect, auth, etc.
     def test_sslInitWithAutosigningLocalServer
         # autosign everything, for simplicity
@@ -195,3 +186,5 @@ class TestClient < Test::Unit::TestCase
                "PID file was not created")
     end
 end
+
+# $Id$
diff --git a/test/client/master.rb b/test/client/master.rb
index 2f88123b5..2b6688979 100644
--- a/test/client/master.rb
+++ b/test/client/master.rb
@@ -1,17 +1,10 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/client'
 require 'puppet/server'
-require 'test/unit'
-require 'puppettest.rb'
+require 'puppettest'
 
 class TestMasterClient < Test::Unit::TestCase
-	include ServerTest
+    include PuppetTest::ServerTest
 
     def mkmaster(file = nil)
         master = nil
diff --git a/test/client/pelement.rb b/test/client/pelement.rb
index 4d782cf03..d5f8e824a 100644
--- a/test/client/pelement.rb
+++ b/test/client/pelement.rb
@@ -1,19 +1,12 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/client/pelement'
 require 'puppet/server'
-require 'test/unit'
-require 'puppettest.rb'
+require 'puppettest'
 
 # $Id$
 
 class TestPElementClient < Test::Unit::TestCase
-	include ServerTest
+    include PuppetTest::ServerTest
 
     def mkpelementserver
         handlers = {
-- 
cgit