[Zodb-checkins] CVS: ZODB3/ZEO/tests - ConnectionTests.py:1.28 InvalidationTests.py:1.3 testConnection.py:1.15

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv7403/ZEO/tests

Modified Files:
	ConnectionTests.py InvalidationTests.py testConnection.py 
Log Message:
Reorganize the way concurrent update tests are integrated, because
they shouldn't run with mapping storage.


=== ZODB3/ZEO/tests/ConnectionTests.py 1.27 => 1.28 ===
--- ZODB3/ZEO/tests/ConnectionTests.py:1.27	Fri Jun 13 17:56:37 2003
+++ ZODB3/ZEO/tests/ConnectionTests.py	Fri Jun 13 18:26:28 2003
@@ -199,7 +199,7 @@
                 self.fail("timed out waiting for storage to disconnect")
 
 
-class ConnectionTests(CommonSetupTearDown, InvalidationTests):
+class ConnectionTests(CommonSetupTearDown):
     """Tests that explicitly manage the server process.
 
     To test the cache or re-connection, these test cases explicit


=== ZODB3/ZEO/tests/InvalidationTests.py 1.2 => 1.3 ===
--- ZODB3/ZEO/tests/InvalidationTests.py:1.2	Fri Jun 13 17:56:37 2003
+++ ZODB3/ZEO/tests/InvalidationTests.py	Fri Jun 13 18:26:28 2003
@@ -20,6 +20,7 @@
 from BTrees.OOBTree import OOBTree
 
 from ZEO.tests.TestThread import TestThread
+from ZEO.tests.ConnectionTests import CommonSetupTearDown
 
 from ZODB.DB import DB
 from ZODB.POSException \
@@ -150,7 +151,7 @@
             cn.close()
         return 0
 
-class InvalidationTests:
+class InvalidationTests(CommonSetupTearDown):
 
     level = 2
     DELAY = 15


=== ZODB3/ZEO/tests/testConnection.py 1.14 => 1.15 ===
--- ZODB3/ZEO/tests/testConnection.py:1.14	Fri Jun 13 17:56:37 2003
+++ ZODB3/ZEO/tests/testConnection.py	Fri Jun 13 18:26:28 2003
@@ -20,7 +20,7 @@
 # System imports
 import unittest
 # Import the actual test class
-from ZEO.tests import ConnectionTests
+from ZEO.tests import ConnectionTests, InvalidationTests
 
 
 class FileStorageConfig:
@@ -49,7 +49,8 @@
 
 class FileStorageConnectionTests(
     FileStorageConfig,
-    ConnectionTests.ConnectionTests
+    ConnectionTests.ConnectionTests.
+    InvalidationTests.InvalidationTests
     ):
     """FileStorage-specific connection tests."""
     level = 2
@@ -72,6 +73,7 @@
 class BDBConnectionTests(
     BerkeleyStorageConfig,
     ConnectionTests.ConnectionTests
+    InvalidationTests.InvalidationTests
     ):
     """Berkeley storage connection tests."""
     level = 2