Reorganize the way concurrent update tests are integrated, because

they shouldn't run with mapping storage.

trunk/src/ZEO/tests/ConnectionTests.py

@@ -199,7 +199,7 @@ class CommonSetupTearDown(StorageTestBase):
                 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

trunk/src/ZEO/tests/InvalidationTests.py

@@ -20,6 +20,7 @@ from BTrees.check import check, display
 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 @@ class VersionStressThread(TestThread):
             cn.close()
         return 0
 
-class InvalidationTests:
+class InvalidationTests(CommonSetupTearDown):
 
     level = 2
     DELAY = 15

trunk/src/ZEO/tests/testConnection.py

@@ -20,7 +20,7 @@ platform-dependent scaffolding.
 # 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 MappingStorageConfig:
 
 class FileStorageConnectionTests(
     FileStorageConfig,
-    ConnectionTests.ConnectionTests
+    ConnectionTests.ConnectionTests.
+    InvalidationTests.InvalidationTests
     ):
     """FileStorage-specific connection tests."""
     level = 2
@@ -72,6 +73,7 @@ class FileStorageTimeoutTests(
 class BDBConnectionTests(
     BerkeleyStorageConfig,
     ConnectionTests.ConnectionTests
+    InvalidationTests.InvalidationTests
     ):
     """Berkeley storage connection tests."""
     level = 2