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

6 files changed, 12 insertions, 6 deletions

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]