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

4 files changed, 4 insertions, 32 deletions

diff --git a/test/util/classgen.rb b/test/util/classgen.rb
index 7b1b4731c..7f3cb23ca 100755
--- a/test/util/classgen.rb
+++ b/test/util/classgen.rb
@@ -1,15 +1,8 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $puppetbase = ".."
-end
-
 require 'puppet'
 require 'puppettest'
-require 'test/unit'
 
 class TestPuppetUtilClassGen < Test::Unit::TestCase
-    include TestPuppet
+    include PuppetTest
 
     class FakeBase
         class << self
diff --git a/test/util/execution.rb b/test/util/execution.rb
index ec56c84bb..932e03807 100755
--- a/test/util/execution.rb
+++ b/test/util/execution.rb
@@ -1,15 +1,8 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $puppetbase = ".."
-end
-
 require 'puppet'
 require 'puppettest'
-require 'test/unit'
 
 class TestPuppetUtilExecution < Test::Unit::TestCase
-    include TestPuppet
+    include PuppetTest
 
     def test_withenv
         ENV["testing"] = "yay"
diff --git a/test/util/package.rb b/test/util/package.rb
index 2d7f633de..bb5cd3c85 100755
--- a/test/util/package.rb
+++ b/test/util/package.rb
@@ -1,16 +1,9 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $puppetbase = ".."
-end
-
 require 'puppet'
 require 'puppet/util/package'
 require 'puppettest'
-require 'test/unit'
 
 class TestPuppetUtilPackage < Test::Unit::TestCase
-    include TestPuppet
+    include PuppetTest
     include Puppet::Util::Package
 
     def test_versioncmp
diff --git a/test/util/utiltest.rb b/test/util/utiltest.rb
index 481b8a9fe..b3a356429 100755
--- a/test/util/utiltest.rb
+++ b/test/util/utiltest.rb
@@ -1,15 +1,8 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $puppetbase = ".."
-end
-
 require 'puppet'
 require 'puppettest'
-require 'test/unit'
 
 class TestPuppetUtil < Test::Unit::TestCase
-    include TestPuppet
+    include PuppetTest
 
     # we're getting corrupt files, probably because multiple processes
     # are reading or writing the file at once