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