[Checkins] SVN: zope.app.testing/trunk/ clean up some transaction management in the functional test setup

[Fred L. Drake, Jr.]

Log message for revision 90208:
  clean up some transaction management in the functional test setup

Changed:
  U   zope.app.testing/trunk/CHANGES.txt
  U   zope.app.testing/trunk/src/zope/app/testing/functional.py

-=-
Modified: zope.app.testing/trunk/CHANGES.txt
===================================================================
--- zope.app.testing/trunk/CHANGES.txt	2008-08-25 13:50:01 UTC (rev 90207)
+++ zope.app.testing/trunk/CHANGES.txt	2008-08-25 13:50:44 UTC (rev 90208)
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+3.5.4 (unreleased)
+------------------
+
+- Clean up some transaction management in the functional test setup.
+
 3.5.3 (2008-08-22)
 ------------------
 

Modified: zope.app.testing/trunk/src/zope/app/testing/functional.py
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/functional.py	2008-08-25 13:50:01 UTC (rev 90207)
+++ zope.app.testing/trunk/src/zope/app/testing/functional.py	2008-08-25 13:50:44 UTC (rev 90208)
@@ -208,6 +208,9 @@
                 BaseDatabaseFactory(name, self._base_storages)
                 for name in database_names
                 )[0][0]
+            # This handles anything added by generations or other bootstrap
+            # subscribers.
+            commit()
             self.dbstack = []
             self.app = Debugger(self.db, config_file)
 
@@ -265,6 +268,7 @@
             ok = base.unregisterUtility(db, IDatabase, name)
             assert ok
             dbs.append(db)
+        abort()
         if self.connection:
             self.connection.close()
             self.connection = None
@@ -286,7 +290,6 @@
 
     def tearDown(self):
         """Cleans up after a functional test case."""
-        abort()
         self._close_databases()
         self.db, self.connection = self.dbstack.pop()
         setSite(None)