switching test classes back to modules -- making them classes causes too many empty tests to run every time

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@714 980ebf18-57e1-0310-9a29-db15c13687c0

39 files changed, 86 insertions, 44 deletions

diff --git a/test/client/tc_client.rb b/test/client/tc_client.rb
index 27d135d4d..39c19bb16 100644
--- a/test/client/tc_client.rb
+++ b/test/client/tc_client.rb
@@ -12,7 +12,8 @@ require 'puppettest.rb'
 
 # $Id$
 
-class TestClient < ServerTest
+class TestClient < Test::Unit::TestCase
+	include ServerTest
     # a single run through of connect, auth, etc.
     def test_sslInitWithAutosigningLocalServer
         # autosign everything, for simplicity
diff --git a/test/executables/tc_puppetbin.rb b/test/executables/tc_puppetbin.rb
index 158666f47..4a3eb7946 100755
--- a/test/executables/tc_puppetbin.rb
+++ b/test/executables/tc_puppetbin.rb
@@ -21,7 +21,8 @@ libdirs = $:.find_all { |dir|
 }
 ENV["RUBYLIB"] = libdirs.join(":")
 
-class TestPuppetBin < ServerTest
+class TestPuppetBin < Test::Unit::TestCase
+	include ServerTest
     def test_version
         output = nil
         assert_nothing_raised {
diff --git a/test/executables/tc_puppetca.rb b/test/executables/tc_puppetca.rb
index 1ef3203e1..61b83b178 100755
--- a/test/executables/tc_puppetca.rb
+++ b/test/executables/tc_puppetca.rb
@@ -21,7 +21,8 @@ libdirs = $:.find_all { |dir|
 }
 ENV["RUBYLIB"] = libdirs.join(":")
 
-class TestPuppetCA < ServerTest
+class TestPuppetCA < Test::Unit::TestCase
+	include ServerTest
     def mkcert(hostname)
         cert = nil
         assert_nothing_raised {
diff --git a/test/executables/tc_puppetd.rb b/test/executables/tc_puppetd.rb
index bc78e6896..e7a55b480 100755
--- a/test/executables/tc_puppetd.rb
+++ b/test/executables/tc_puppetd.rb
@@ -22,7 +22,8 @@ libdirs = $:.find_all { |dir|
 }
 ENV["RUBYLIB"] = libdirs.join(":")
 
-class TestPuppetDExe < ExeTest
+class TestPuppetDExe < Test::Unit::TestCase
+	include ExeTest
     def test_normalstart
         # start the master
         file = startmasterd
diff --git a/test/executables/tc_puppetmasterd.rb b/test/executables/tc_puppetmasterd.rb
index 9367cce80..7051f02a7 100755
--- a/test/executables/tc_puppetmasterd.rb
+++ b/test/executables/tc_puppetmasterd.rb
@@ -14,7 +14,8 @@ require 'facter'
 
 # $Id$
 
-class TestPuppetMasterD < ExeTest
+class TestPuppetMasterD < Test::Unit::TestCase
+	include ExeTest
     def getcerts
         include Puppet::Daemon
         if self.readcerts
diff --git a/test/language/tc_ast.rb b/test/language/tc_ast.rb
index ab336c9e1..d78ce382c 100755
--- a/test/language/tc_ast.rb
+++ b/test/language/tc_ast.rb
@@ -13,7 +13,8 @@ require 'puppet/client'
 require 'test/unit'
 require 'puppettest'
 
-class TestAST < TestPuppet
+class TestAST < Test::Unit::TestCase
+	include TestPuppet
     AST = Puppet::Parser::AST
 
     def astarray
diff --git a/test/language/tc_interpreter.rb b/test/language/tc_interpreter.rb
index 8767dd8a3..a37d0d95a 100755
--- a/test/language/tc_interpreter.rb
+++ b/test/language/tc_interpreter.rb
@@ -13,7 +13,8 @@ require 'puppet/client'
 require 'test/unit'
 require 'puppettest'
 
-class TestInterpreter < TestPuppet
+class TestInterpreter < Test::Unit::TestCase
+	include TestPuppet
     AST = Puppet::Parser::AST
 
     def test_simple
diff --git a/test/language/tc_scope.rb b/test/language/tc_scope.rb
index 5b1918707..38bcdce5a 100755
--- a/test/language/tc_scope.rb
+++ b/test/language/tc_scope.rb
@@ -22,7 +22,8 @@ require 'puppettest'
 # 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 TestScope < TestPuppet
+class TestScope < Test::Unit::TestCase
+	include TestPuppet
     AST = Puppet::Parser::AST
     def to_ary(hash)
         hash.collect { |key,value|
diff --git a/test/language/tc_snippets.rb b/test/language/tc_snippets.rb
index c04b3ae5d..450c656b7 100755
--- a/test/language/tc_snippets.rb
+++ b/test/language/tc_snippets.rb
@@ -23,7 +23,8 @@ require 'puppettest'
 # 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 < TestPuppet
+class TestSnippets < Test::Unit::TestCase
+	include TestPuppet
     $snippetbase = File.join($puppetbase, "examples", "code", "snippets")
     
     def file2ast(file)
diff --git a/test/other/tc_events.rb b/test/other/tc_events.rb
index c555e17f0..61551983e 100755
--- a/test/other/tc_events.rb
+++ b/test/other/tc_events.rb
@@ -10,7 +10,8 @@ require 'test/unit'
 
 # $Id$
 
-class TestEvents < TestPuppet
+class TestEvents < Test::Unit::TestCase
+	include TestPuppet
     def teardown
         super
         Puppet::Event::Subscription.clear
diff --git a/test/other/tc_overrides.rb b/test/other/tc_overrides.rb
index 6c7f91ddf..be9ccd2ce 100755
--- a/test/other/tc_overrides.rb
+++ b/test/other/tc_overrides.rb
@@ -8,7 +8,8 @@ require 'puppet'
 require 'puppettest'
 require 'test/unit'
 
-class TestOverrides < TestPuppet
+class TestOverrides < Test::Unit::TestCase
+	include TestPuppet
     def mksubdirs(basedir, level)
         @@tmpfiles << basedir
         dir = basedir.dup
diff --git a/test/other/tc_parsedfile.rb b/test/other/tc_parsedfile.rb
index fe96fad2d..e343e5478 100755
--- a/test/other/tc_parsedfile.rb
+++ b/test/other/tc_parsedfile.rb
@@ -9,7 +9,8 @@ require 'puppet/parsedfile'
 require 'puppettest'
 require 'test/unit'
 
-class TestParsedFile < TestPuppet
+class TestParsedFile < Test::Unit::TestCase
+	include TestPuppet
     def test_file
         file = nil
         path = tempfile()
diff --git a/test/other/tc_relationships.rb b/test/other/tc_relationships.rb
index d2544ffa4..04cbd73dc 100755
--- a/test/other/tc_relationships.rb
+++ b/test/other/tc_relationships.rb
@@ -8,7 +8,8 @@ require 'puppet'
 require 'puppettest'
 require 'test/unit'
 
-class TestRelationships < TestPuppet
+class TestRelationships < Test::Unit::TestCase
+	include TestPuppet
     def newfile
         assert_nothing_raised() {
             return Puppet::Type::PFile.create(
diff --git a/test/other/tc_state.rb b/test/other/tc_state.rb
index 6bbe76277..bd17d86c3 100644
--- a/test/other/tc_state.rb
+++ b/test/other/tc_state.rb
@@ -14,7 +14,8 @@ require 'test/unit'
 class StorageTestingClass
 end
 
-class TestStorage < TestPuppet
+class TestStorage < Test::Unit::TestCase
+	include TestPuppet
     def disabled_setup
         Puppet[:loglevel] = :debug if __FILE__ == $0
         Puppet[:checksumfile] = "/var/tmp/puppetteststate"
diff --git a/test/other/tc_transactions.rb b/test/other/tc_transactions.rb
index 6b6213b81..6df5c3485 100644
--- a/test/other/tc_transactions.rb
+++ b/test/other/tc_transactions.rb
@@ -10,7 +10,8 @@ require 'test/unit'
 
 # $Id$
 
-class TestTransactions < FileTesting
+class TestTransactions < Test::Unit::TestCase
+	include FileTesting
     def ingroup(gid)
         require 'etc'
         begin
diff --git a/test/parser/tc_lexer.rb b/test/parser/tc_lexer.rb
index 4473ce492..d37004ef3 100644
--- a/test/parser/tc_lexer.rb
+++ b/test/parser/tc_lexer.rb
@@ -16,7 +16,8 @@ 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 < TestPuppet
+class TestLexer < Test::Unit::TestCase
+	include TestPuppet
     def setup
         super
         @lexer = Puppet::Parser::Lexer.new()
diff --git a/test/parser/tc_parser.rb b/test/parser/tc_parser.rb
index 4e3d83a63..16ac0048b 100644
--- a/test/parser/tc_parser.rb
+++ b/test/parser/tc_parser.rb
@@ -9,7 +9,8 @@ require 'puppet/parser/parser'
 require 'test/unit'
 require 'puppettest'
 
-class TestParser < TestPuppet
+class TestParser < Test::Unit::TestCase
+	include TestPuppet
     def setup
         super
         Puppet[:parseonly] = true
diff --git a/test/puppettest.rb b/test/puppettest.rb
index 6b91f1049..1ffad0833 100644
--- a/test/puppettest.rb
+++ b/test/puppettest.rb
@@ -5,7 +5,7 @@ unless $:.include?(libdir)
     $:.unshift libdir
 end
 
-class TestPuppet < Test::Unit::TestCase
+module TestPuppet
     def newcomp(name,*ary)
         comp = Puppet::Type::Component.create(
             :name => name
@@ -146,7 +146,8 @@ class TestPuppet < Test::Unit::TestCase
 end
 
 
-class ServerTest < TestPuppet
+module ServerTest
+    include TestPuppet
     def setup
         if defined? @@port
             @@port += 1
@@ -210,7 +211,8 @@ class ServerTest < TestPuppet
 
 end
 
-class ExeTest < ServerTest
+module ExeTest
+    include ServerTest
     unless ENV["PATH"] =~ /puppet/
         # ok, we have to add the bin directory to our search path
         ENV["PATH"] += ":" + File.join($puppetbase, "bin")
@@ -273,7 +275,8 @@ class ExeTest < ServerTest
     end
 end
 
-class FileTesting < TestPuppet
+module FileTesting
+    include TestPuppet
     def cycle(comp)
         trans = nil
         assert_nothing_raised {
@@ -500,7 +503,7 @@ class FileTesting < TestPuppet
     end
 end
 
-class PuppetTestSuite
+module PuppetTestSuite
     attr_accessor :subdir
 
     def self.list
diff --git a/test/server/tc_authstore.rb b/test/server/tc_authstore.rb
index 38c657770..c7dfd0978 100755
--- a/test/server/tc_authstore.rb
+++ b/test/server/tc_authstore.rb
@@ -13,7 +13,8 @@ require 'puppet/server/authstore'
 require 'test/unit'
 require 'puppettest.rb'
 
-class TestAuthStore < TestPuppet
+class TestAuthStore < Test::Unit::TestCase
+	include TestPuppet
     def setup
         if __FILE__ == $0
             Puppet[:loglevel] = :debug
diff --git a/test/server/tc_bucket.rb b/test/server/tc_bucket.rb
index 49f01287a..658b8fcce 100644
--- a/test/server/tc_bucket.rb
+++ b/test/server/tc_bucket.rb
@@ -12,7 +12,8 @@ require 'test/unit'
 require 'puppettest.rb'
 require 'base64'
 
-class TestBucket < ServerTest
+class TestBucket < Test::Unit::TestCase
+	include ServerTest
     # run through all of the files and exercise the filebucket methods
     def checkfiles(client)
         files = filelist()
diff --git a/test/server/tc_ca.rb b/test/server/tc_ca.rb
index a7050b38d..39c476675 100644
--- a/test/server/tc_ca.rb
+++ b/test/server/tc_ca.rb
@@ -19,7 +19,8 @@ else
     $short = false
 end
 
-class TestCA < ServerTest
+class TestCA < Test::Unit::TestCase
+	include ServerTest
     def teardown
         super
         print "\n\n" if Puppet[:debug]
diff --git a/test/server/tc_fileserver.rb b/test/server/tc_fileserver.rb
index 17003a6fe..6712c30b7 100755
--- a/test/server/tc_fileserver.rb
+++ b/test/server/tc_fileserver.rb
@@ -13,7 +13,8 @@ require 'puppet/server/fileserver'
 require 'test/unit'
 require 'puppettest.rb'
 
-class TestFileServer < TestPuppet
+class TestFileServer < Test::Unit::TestCase
+	include TestPuppet
     # make a simple file source
     def mktestdir
         testdir = File.join(tmpdir(), "remotefilecopytesting")
diff --git a/test/server/tc_master.rb b/test/server/tc_master.rb
index f4d5d967b..df5d092d7 100644
--- a/test/server/tc_master.rb
+++ b/test/server/tc_master.rb
@@ -14,7 +14,8 @@ require 'puppet/client'
 require 'test/unit'
 require 'puppettest.rb'
 
-class TestMaster < ServerTest
+class TestMaster < Test::Unit::TestCase
+	include ServerTest
     def teardown
         super
         print "\n\n\n\n" if Puppet[:debug]
diff --git a/test/server/tc_server.rb b/test/server/tc_server.rb
index d7056eef4..aa75b1422 100644
--- a/test/server/tc_server.rb
+++ b/test/server/tc_server.rb
@@ -21,7 +21,8 @@ else
     $short = false
 end
 
-class TestServer < ServerTest
+class TestServer < Test::Unit::TestCase
+	include ServerTest
     def teardown
         super
         print "\n\n\n\n" if Puppet[:debug]
diff --git a/test/types/tc_basic.rb b/test/types/tc_basic.rb
index 6ba91f076..3928042fb 100644
--- a/test/types/tc_basic.rb
+++ b/test/types/tc_basic.rb
@@ -8,7 +8,8 @@ require 'puppet'
 require 'puppettest'
 require 'test/unit'
 
-class TestBasic < TestPuppet
+class TestBasic < Test::Unit::TestCase
+	include TestPuppet
     # hmmm
     # this is complicated, because we store references to the created
     # objects in a central store
diff --git a/test/types/tc_component.rb b/test/types/tc_component.rb
index 8cf3ece4b..d52123ae0 100755
--- a/test/types/tc_component.rb
+++ b/test/types/tc_component.rb
@@ -10,7 +10,8 @@ require 'test/unit'
 
 # $Id$
 
-class TestComponent < TestPuppet
+class TestComponent < Test::Unit::TestCase
+	include TestPuppet
     def setup
         @@used = {}
         super
diff --git a/test/types/tc_cron.rb b/test/types/tc_cron.rb
index 4389e80ae..ffefba3c1 100755
--- a/test/types/tc_cron.rb
+++ b/test/types/tc_cron.rb
@@ -12,7 +12,8 @@ require 'puppet/type/cron'
 require 'test/unit'
 require 'facter'
 
-class TestExec < TestPuppet
+class TestExec < Test::Unit::TestCase
+	include TestPuppet
     def setup
         # retrieve the user name
         id = %x{id}.chomp
diff --git a/test/types/tc_exec.rb b/test/types/tc_exec.rb
index 0e4de4d9d..99e120ea2 100755
--- a/test/types/tc_exec.rb
+++ b/test/types/tc_exec.rb
@@ -11,7 +11,8 @@ require 'facter'
 
 # $Id$
 
-class TestExec < TestPuppet
+class TestExec < Test::Unit::TestCase
+	include TestPuppet
     def test_execution
         command = nil
         output = nil
diff --git a/test/types/tc_file.rb b/test/types/tc_file.rb
index ec357dcc0..713dd96c1 100644
--- a/test/types/tc_file.rb
+++ b/test/types/tc_file.rb
@@ -9,7 +9,8 @@ require 'test/unit'
 require 'fileutils'
 require 'puppettest'
 
-class TestFile < FileTesting
+class TestFile < Test::Unit::TestCase
+	include FileTesting
     # hmmm
     # this is complicated, because we store references to the created
     # objects in a central store
diff --git a/test/types/tc_filebucket.rb b/test/types/tc_filebucket.rb
index a8ba7a8c3..a5c8e0c78 100755
--- a/test/types/tc_filebucket.rb
+++ b/test/types/tc_filebucket.rb
@@ -11,7 +11,8 @@ require 'puppettest'
 
 # $Id$
 
-class TestFileBucket < FileTesting
+class TestFileBucket < Test::Unit::TestCase
+	include FileTesting
     # hmmm
     # this is complicated, because we store references to the created
     # objects in a central store
diff --git a/test/types/tc_fileignoresource.rb b/test/types/tc_fileignoresource.rb
index 40013e6de..f3d258381 100644
--- a/test/types/tc_fileignoresource.rb
+++ b/test/types/tc_fileignoresource.rb
@@ -13,7 +13,8 @@ require 'puppettest'
 
 # $Id: $
 
-class TestFileIgnoreSources < FileTesting
+class TestFileIgnoreSources < Test::Unit::TestCase
+	include FileTesting
    
     def setup
         begin
diff --git a/test/types/tc_filesources.rb b/test/types/tc_filesources.rb
index 031e1b76e..46542d76c 100755
--- a/test/types/tc_filesources.rb
+++ b/test/types/tc_filesources.rb
@@ -11,7 +11,8 @@ require 'test/unit'
 require 'fileutils'
 require 'puppettest'
 
-class TestFileSources < FileTesting
+class TestFileSources < Test::Unit::TestCase
+	include FileTesting
     def setup
         begin
             initstorage
diff --git a/test/types/tc_group.rb b/test/types/tc_group.rb
index b16f28eba..dd705b6e5 100755
--- a/test/types/tc_group.rb
+++ b/test/types/tc_group.rb
@@ -11,7 +11,8 @@ require 'puppet/type'
 require 'puppettest'
 require 'test/unit'
 
-class TestGroup < TestPuppet
+class TestGroup < Test::Unit::TestCase
+	include TestPuppet
     def setup
         @@tmpgroups = []
         super
diff --git a/test/types/tc_package.rb b/test/types/tc_package.rb
index 4abdcbd0b..55ef21914 100644
--- a/test/types/tc_package.rb
+++ b/test/types/tc_package.rb
@@ -15,7 +15,8 @@ unless Puppet::Type::Package.default
     puts "No default package type for %s; skipping package tests" % $platform
 else
 
-class TestPackageSource < TestPuppet
+class TestPackageSource < Test::Unit::TestCase
+	include TestPuppet
     def test_filesource
         system("touch /tmp/fakepackage")
         assert_equal(
@@ -26,7 +27,8 @@ class TestPackageSource < TestPuppet
     end
 end
 
-class TestPackages < FileTesting
+class TestPackages < Test::Unit::TestCase
+	include FileTesting
     def setup
         #@list = Puppet::Type::Package.getpkglist
         Puppet::Type::Package.clear
diff --git a/test/types/tc_service.rb b/test/types/tc_service.rb
index 82827c734..b2a919478 100644
--- a/test/types/tc_service.rb
+++ b/test/types/tc_service.rb
@@ -10,7 +10,8 @@ require 'test/unit'
 
 # $Id$
 
-class TestService < TestPuppet
+class TestService < Test::Unit::TestCase
+	include TestPuppet
     # hmmm
     # this is complicated, because we store references to the created
     # objects in a central store
diff --git a/test/types/tc_symlink.rb b/test/types/tc_symlink.rb
index 9c09d2505..3d288bc0a 100755
--- a/test/types/tc_symlink.rb
+++ b/test/types/tc_symlink.rb
@@ -10,7 +10,8 @@ require 'test/unit'
 
 # $Id$
 
-class TestSymlink < FileTesting
+class TestSymlink < Test::Unit::TestCase
+	include FileTesting
     def mktmpfile
         # because luke's home directory is on nfs, it can't be used for testing
         # as root
diff --git a/test/types/tc_tidy.rb b/test/types/tc_tidy.rb
index 676d866dc..02068b6ff 100755
--- a/test/types/tc_tidy.rb
+++ b/test/types/tc_tidy.rb
@@ -10,7 +10,8 @@ require 'test/unit'
 
 # $Id$
 
-class TestTidy < FileTesting
+class TestTidy < Test::Unit::TestCase
+	include FileTesting
     def mktmpfile
         # because luke's home directory is on nfs, it can't be used for testing
         # as root
diff --git a/test/types/tc_type.rb b/test/types/tc_type.rb
index f746f287b..509a4b402 100644
--- a/test/types/tc_type.rb
+++ b/test/types/tc_type.rb
@@ -10,7 +10,8 @@ require 'puppet/type'
 require 'puppettest'
 require 'test/unit'
 
-class TestType < TestPuppet
+class TestType < Test::Unit::TestCase
+	include TestPuppet
     def test_typemethods
         assert_nothing_raised() {
             Puppet::Type.buildstatehash
diff --git a/test/types/tc_user.rb b/test/types/tc_user.rb
index 7c82587c7..f418872a0 100755
--- a/test/types/tc_user.rb
+++ b/test/types/tc_user.rb
@@ -11,7 +11,8 @@ require 'puppet/type'
 require 'puppettest'
 require 'test/unit'
 
-class TestUser < TestPuppet
+class TestUser < Test::Unit::TestCase
+	include TestPuppet
     def setup
         @@tmpusers = []
         Puppet[:loglevel] = :debug if __FILE__ == $0