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, 1 insertions, 8 deletions

diff --git a/test/language/scope.rb b/test/language/scope.rb
index 3e5b5d24b..85189627d 100755
--- a/test/language/scope.rb
+++ b/test/language/scope.rb
@@ -1,16 +1,9 @@
 #!/usr/bin/ruby
 
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
 require 'puppet/client'
-require 'test/unit'
 require 'puppettest'
 
 # so, what kind of things do we want to test?
@@ -23,7 +16,7 @@ require 'puppettest'
 # and test whether we've got things in the right scopes
 
 class TestScope < Test::Unit::TestCase
-	include ParserTesting
+    include PuppetTest::ParserTesting
 
     def to_ary(hash)
         hash.collect { |key,value|