this could work...

[roundup.git] / test / test_init.py

diff --git a/test/test_init.py b/test/test_init.py
index b21a5ff8561a03c99a343bb427f805122c5532f6..1a9520ddf9b28a4e9ab64c06e24ebe417026d509 100644 (file)
--- a/test/test_init.py
+++ b/test/test_init.py
@@ -15,11 +15,11 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: test_init.py,v 1.8 2002-05-15 03:27:16 richard Exp $
+# $Id: test_init.py,v 1.13 2002-07-14 02:05:54 richard Exp $
 
 import unittest, os, shutil, errno, imp, sys
 
-from roundup.init import init
+from roundup import init
 
 class MyTestCase(unittest.TestCase):
     count = 0
@@ -43,7 +43,8 @@ class ClassicTestCase(MyTestCase):
         ae = self.assertEqual
 
         # create the instance
-        init(self.dirname, 'classic', self.backend, 'sekrit')
+        init.install(self.dirname, 'classic', self.backend)
+        init.initialise(self.dirname, 'sekrit')
 
         # check we can load the package
         instance = imp.load_package(self.dirname, self.dirname)
@@ -73,7 +74,8 @@ class ExtendedTestCase(MyTestCase):
         ae = self.assertEqual
 
         # create the instance
-        init(self.dirname, 'extended', self.backend, 'sekrit')
+        init.install(self.dirname, 'extended', self.backend)
+        init.initialise(self.dirname, 'sekrit')
 
         # check we can load the package
         instance = imp.load_package(self.dirname, self.dirname)
@@ -117,9 +119,17 @@ class bsddb3ClassicTestCase(ClassicTestCase):
 class bsddb3ExtendedTestCase(ExtendedTestCase):
     backend = 'bsddb3'
 
+class metakitClassicTestCase(ClassicTestCase):
+    backend = 'metakit'
+class metakitExtendedTestCase(ExtendedTestCase):
+    backend = 'metakit'
+
 def suite():
-    l = [unittest.makeSuite(ClassicTestCase, 'test'),
-         unittest.makeSuite(ExtendedTestCase, 'test')]
+    l = [
+        unittest.makeSuite(ClassicTestCase, 'test'),
+        unittest.makeSuite(ExtendedTestCase, 'test')
+    ]
+
     try:
         import bsddb
         l.append(unittest.makeSuite(bsddbClassicTestCase, 'test'))
@@ -127,17 +137,45 @@ def suite():
     except:
         print 'bsddb module not found, skipping bsddb DBTestCase'
 
-#    try:
-#        import bsddb3
-#        l.append(unittest.makeSuite(bsddb3ClassicTestCase, 'test'))
-#        l.append(unittest.makeSuite(bsddb3ExtendedTestCase, 'test'))
-#    except:
-#        print 'bsddb3 module not found, skipping bsddb3 DBTestCase'
+    try:
+        import bsddb3
+        l.append(unittest.makeSuite(bsddb3ClassicTestCase, 'test'))
+        l.append(unittest.makeSuite(bsddb3ExtendedTestCase, 'test'))
+    except:
+        print 'bsddb3 module not found, skipping bsddb3 DBTestCase'
+
+    try:
+        import metakit
+        l.append(unittest.makeSuite(metakitClassicTestCase, 'test'))
+        l.append(unittest.makeSuite(metakitExtendedTestCase, 'test'))
+    except:
+        print 'metakit module not found, skipping metakit DBTestCase'
 
     return unittest.TestSuite(l)
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.12  2002/07/11 01:13:13  richard
+# *** empty log message ***
+#
+# Revision 1.11  2002/07/11 01:12:34  richard
+# Forgot to add to init tests
+#
+# Revision 1.10  2002/06/11 04:59:14  richard
+# enabled testing of bsddb in test_init
+#
+# Revision 1.9  2002/05/23 04:26:05  richard
+# 'I must run unit tests before committing\n' * 100
+#
+# Revision 1.8  2002/05/15 03:27:16  richard
+#  . fixed SCRIPT_NAME in ZRoundup for instances not at top level of Zope
+#    (thanks dman)
+#  . fixed some sorting issues that were breaking some unit tests under py2.2
+#  . mailgw test output dir was confusing the init test (but only on 2.2 *shrug*)
+#
+# fixed bug in the init unit test that meant only the bsddb test ran if it
+# could (it clobbered the anydbm test)
+#
 # Revision 1.7  2001/10/28 22:51:38  richard
 # Fixed ENOENT/WindowsError thing, thanks Juergen Hermann
 #