Commit 18c1e979 authored by Jim Fulton's avatar Jim Fulton

Use ZODB.tests.util setup code, which has logic to wait for processes

to die when removing test directories.
parent 27645fa6
......@@ -26,9 +26,6 @@ import time
import unittest
import shutil
import zope.testing.setupstack
from zope.testing import doctest
# ZODB test support
import ZODB
import ZODB.tests.util
......@@ -820,10 +817,6 @@ transaction, we'll get a result:
test_classes = [FileStorageTests, MappingStorageTests, DemoStorageTests,
BlobAdaptedFileStorageTests, BlobWritableCacheTests]
def zeoFanOutSetup(test):
zope.testing.setupstack.setUpDirectory(test)
def test_suite():
suite = unittest.TestSuite()
suite.addTest(doctest.DocTestSuite(setUp=ZODB.tests.util.setUp,
......@@ -831,8 +824,8 @@ def test_suite():
suite.addTest(doctest.DocFileSuite('registerDB.test'))
suite.addTest(
doctest.DocFileSuite('zeo-fan-out.test',
setUp=zeoFanOutSetup,
tearDown=zope.testing.setupstack.tearDown,
setUp=ZODB.tests.util.setUp,
tearDown=ZODB.tests.util.tearDown,
),
)
for klass in test_classes:
......
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