Commit ec45de42 authored by Jeremy Hylton's avatar Jeremy Hylton

Fix test failures caused by change to StorageTestBase.setUp().

The base setUp() initializes _storage to None.  A subclass that
extends it must call the superclass method before initializing
_storage.

Also, mixin MTStorage, since this storage out to be thread-safe.
parent a989ae56
...@@ -12,7 +12,7 @@ import sys, os, unittest, time ...@@ -12,7 +12,7 @@ import sys, os, unittest, time
from ZODB.tests import StorageTestBase, BasicStorage, \ from ZODB.tests import StorageTestBase, BasicStorage, \
Synchronization, ConflictResolution, \ Synchronization, ConflictResolution, \
Corruption, RevisionStorage Corruption, RevisionStorage, MTStorage
class TemporaryStorageTests( class TemporaryStorageTests(
StorageTestBase.StorageTestBase, StorageTestBase.StorageTestBase,
...@@ -20,14 +20,15 @@ class TemporaryStorageTests( ...@@ -20,14 +20,15 @@ class TemporaryStorageTests(
BasicStorage.BasicStorage, BasicStorage.BasicStorage,
Synchronization.SynchronizedStorage, Synchronization.SynchronizedStorage,
ConflictResolution.ConflictResolvingStorage, ConflictResolution.ConflictResolvingStorage,
MTStorage.MTStorage,
): ):
def open(self, **kwargs): def open(self, **kwargs):
self._storage = TemporaryStorage.TemporaryStorage('foo') self._storage = TemporaryStorage.TemporaryStorage('foo')
def setUp(self): def setUp(self):
self.open()
StorageTestBase.StorageTestBase.setUp(self) StorageTestBase.StorageTestBase.setUp(self)
self.open()
def tearDown(self): def tearDown(self):
StorageTestBase.StorageTestBase.tearDown(self) StorageTestBase.StorageTestBase.tearDown(self)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment