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/language/interpreter.rb b/test/language/interpreter.rb
index 36fd5922b..37b4e9022 100755
--- a/test/language/interpreter.rb
+++ b/test/language/interpreter.rb
@@ -1,11 +1,5 @@
 #!/usr/bin/ruby
 
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
-
 require 'facter'
 
 require 'puppet'
@@ -13,12 +7,11 @@ require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
 require 'puppet/client'
 require 'puppet/rails'
-require 'test/unit'
 require 'puppettest'
 
 class TestInterpreter < Test::Unit::TestCase
-	include TestPuppet
-	include ServerTest
+	include PuppetTest
+    include PuppetTest::ServerTest
     AST = Puppet::Parser::AST
 
     # create a simple manifest that uses nodes to create a file