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/executables/puppetd.rb b/test/executables/puppetd.rb
index 700ea5bd3..a1a886a0e 100755
--- a/test/executables/puppetd.rb
+++ b/test/executables/puppetd.rb
@@ -1,18 +1,11 @@
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/server'
-require 'test/unit'
-require 'puppettest.rb'
+require 'puppettest'
 require 'socket'
 require 'facter'
 
 class TestPuppetDExe < Test::Unit::TestCase
-	include ExeTest
+    include PuppetTest::ExeTest
     def test_normalstart
         # start the master
         file = startmasterd