[Zope-CVS] CVS: Products/Ape/lib/apelib/tests - testall.py:1.6.2.1 testzope2sql.py:1.6.4.3 zope2testbase.py:1.5.2.2

[Shane Hathaway]

Update of /cvs-repository/Products/Ape/lib/apelib/tests
In directory cvs.zope.org:/tmp/cvs-serv30737/lib/apelib/tests

Modified Files:
      Tag: ape-0_8-branch
	testall.py testzope2sql.py zope2testbase.py 
Log Message:
The PostgreSQL tests now pass.

Some minor changes to interfaces were necessary in order to 
find and call all database initializers.


=== Products/Ape/lib/apelib/tests/testall.py 1.6 => 1.6.2.1 ===
--- Products/Ape/lib/apelib/tests/testall.py:1.6	Thu Aug 14 16:17:41 2003
+++ Products/Ape/lib/apelib/tests/testall.py	Tue Dec 23 00:52:36 2003
@@ -40,7 +40,9 @@
 from testsqlimpl import ApelibSQLImplTests
 from apelib.config.tests.test_minitables import MiniTableTests
 from testscanner import ScanControlTests, ScannerTests
+from testzope2sql import PsycopgTests, MySQLTests
 import testzope2sql
+
 
 sql_suite = testzope2sql.test_suite()
 


=== Products/Ape/lib/apelib/tests/testzope2sql.py 1.6.4.2 => 1.6.4.3 ===
--- Products/Ape/lib/apelib/tests/testzope2sql.py:1.6.4.2	Sat Dec 20 02:31:07 2003
+++ Products/Ape/lib/apelib/tests/testzope2sql.py	Tue Dec 23 00:52:36 2003
@@ -50,6 +50,14 @@
         storage = ApeStorage(resource, self.conns, clear_all=1)
         self.storage = storage
         self.db = ApeDB(storage, resource)
+        c = self.db.open()
+        try:
+            if not c.root().has_key('Application'):
+                from OFS.Application import Application
+                c.root()['Application'] = Application()
+                get_transaction().commit()
+        finally:
+            c.close()
 
     def clear(self):
         self.storage.initDatabases(clear_all=1)


=== Products/Ape/lib/apelib/tests/zope2testbase.py 1.5.2.1 => 1.5.2.2 ===
--- Products/Ape/lib/apelib/tests/zope2testbase.py:1.5.2.1	Sat Dec 20 23:24:05 2003
+++ Products/Ape/lib/apelib/tests/zope2testbase.py	Tue Dec 23 00:52:36 2003
@@ -323,6 +323,8 @@
         conn = self.db.open()
         try:
             app = conn.root()['Application']
+            if hasattr(app, 'acl_users'):
+                app._delObject('acl_users')
             f = UserFolder()
             f.id = 'acl_users'
             app._setObject(f.id, f, set_owner=0)