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

10 files changed, 25 insertions, 95 deletions

diff --git a/test/language/ast.rb b/test/language/ast.rb
index 5bf0c1e4f..ab528a49d 100755
--- a/test/language/ast.rb
+++ b/test/language/ast.rb
@@ -1,20 +1,13 @@
 #!/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'
 
 class TestAST < Test::Unit::TestCase
-	include ParserTesting
+    include PuppetTest::ParserTesting
 
     # A fake class that we can use for testing evaluation.
     class FakeAST
diff --git a/test/language/functions.rb b/test/language/functions.rb
index 3ae381d83..2c3246e6a 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -1,20 +1,13 @@
 #!/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'
 
 class TestLangFunctions < Test::Unit::TestCase
-	include ParserTesting
+    include PuppetTest::ParserTesting
     def test_functions
         assert_raise(Puppet::ParseError) do
             Puppet::Parser::AST::Function.new(
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
diff --git a/test/language/lexer.rb b/test/language/lexer.rb
index 8b578a3fd..496087ba2 100644
--- a/test/language/lexer.rb
+++ b/test/language/lexer.rb
@@ -1,13 +1,6 @@
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/parser/lexer'
-require 'test/unit'
-require 'puppettest.rb'
+require 'puppettest'
 
 #%q{service("telnet") = \{
 #    port => "23",
@@ -17,7 +10,7 @@ require 'puppettest.rb'
 #} => [[:NAME, "service"], [:LPAREN, "("], [:DQUOTE, "\""], [:NAME, "telnet"], [:DQUOTE, "\""], [:RPAREN, ")"], [:EQUALS, "="], [:lbrace, "{"], [:NAME, "port"], [:FARROW, "=>"], [:DQUOTE, "\""], [:NAME, "23"], [:DQUOTE, "\""], [:COMMA, ","], [:NAME, "protocol"], [:FARROW, "=>"], [:DQUOTE, "\""], [:NAME, "tcp"], [:DQUOTE, "\""], [:COMMA, ","], [:NAME, "name"], [:FARROW, "=>"], [:DQUOTE, "\""], [:NAME, "telnet"], [:DQUOTE, "\""], [:COMMA, ","], [:RBRACE, "}"]]
 
 class TestLexer < Test::Unit::TestCase
-	include TestPuppet
+	include PuppetTest
     def setup
         super
         @lexer = Puppet::Parser::Lexer.new()
diff --git a/test/language/node.rb b/test/language/node.rb
index a1bb58a9f..791c44874 100644
--- a/test/language/node.rb
+++ b/test/language/node.rb
@@ -1,16 +1,9 @@
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/parser/parser'
-require 'test/unit'
 require 'puppettest'
 
 class TestParser < Test::Unit::TestCase
-	include ParserTesting
+    include PuppetTest::ParserTesting
 
     def setup
         super
diff --git a/test/language/parser.rb b/test/language/parser.rb
index 6dd9b4bca..d6e176870 100644
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -1,16 +1,9 @@
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/parser/parser'
-require 'test/unit'
 require 'puppettest'
 
 class TestParser < Test::Unit::TestCase
-	include ParserTesting
+    include PuppetTest::ParserTesting
     def setup
         super
         Puppet[:parseonly] = true
diff --git a/test/language/rails.rb b/test/language/rails.rb
index df76b4f20..ada4e0915 100755
--- a/test/language/rails.rb
+++ b/test/language/rails.rb
@@ -1,21 +1,14 @@
 #!/usr/bin/ruby
 
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/rails'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
 require 'puppet/client'
-require 'test/unit'
 require 'puppettest'
 
 class TestRails < Test::Unit::TestCase
-	include ParserTesting
+    include PuppetTest::ParserTesting
 
     def test_includerails
         assert_nothing_raised {
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|
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index 2823f89ad..05ac066eb 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -1,32 +1,23 @@
 #!/usr/bin/ruby -w
 
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
 require 'puppet/client'
 require 'puppet/server'
-require 'test/unit'
 require 'puppettest'
 
-# so, what kind of things do we want to test?
-
-# we don't need to test function, since we're confident in the
-# library tests.  We do, however, need to test how things are actually
-# working in the language.
-
-# so really, we want to do things like test that our ast is correct
-# and test whether we've got things in the right scopes
-
 class TestSnippets < Test::Unit::TestCase
-	include TestPuppet
+	include PuppetTest
     include ObjectSpace
-    $snippetbase = File.join($puppetbase, "examples", "code", "snippets")
+
+    def self.snippetdir
+        PuppetTest.exampledir "code", "snippets"
+    end
+
+    def snippet(name)
+        File.join(self.class.snippetdir, name)
+    end
     
     def file2ast(file)
         parser = Puppet::Parser::Parser.new()
@@ -492,8 +483,8 @@ class TestSnippets < Test::Unit::TestCase
         }
     end
 
-    # XXX this is the answer
-    Dir.entries($snippetbase).sort.each { |file|
+    # Iterate across each of the snippets and create a test.
+    Dir.entries(snippetdir).sort.each { |file|
         next if file =~ /^\./
 
 
@@ -504,7 +495,7 @@ class TestSnippets < Test::Unit::TestCase
             self.send(:define_method, testname) {
                 # first parse the file
                 server = Puppet::Server::Master.new(
-                    :Manifest => File.join($snippetbase, file),
+                    :Manifest => snippet(file),
                     :Local => true
                 )
                 client = Puppet::Client::MasterClient.new(
@@ -557,3 +548,5 @@ class TestSnippets < Test::Unit::TestCase
         end
     }
 end
+
+# $Id$
diff --git a/test/language/transportable.rb b/test/language/transportable.rb
index c973583cd..217bb3370 100755
--- a/test/language/transportable.rb
+++ b/test/language/transportable.rb
@@ -1,19 +1,12 @@
 #!/usr/bin/ruby
 
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
-
 require 'puppet'
 require 'puppet/transportable'
-require 'test/unit'
 require 'puppettest'
 require 'yaml'
 
 class TestTransportable < Test::Unit::TestCase
-	include ParserTesting
+    include PuppetTest::ParserTesting
 
     def test_yamldumpobject
         obj = mk_transobject