Commit 8bdffbf6 authored by Jim Fulton's avatar Jim Fulton

Tweaked the multi-processing test to run in it's own layer, to reduce

chance of affecting other tests, at least when run in a separate
process via the -j runner option.
parent 59bb926f
...@@ -1268,9 +1268,15 @@ if sys.version_info >= (2, 6): ...@@ -1268,9 +1268,15 @@ if sys.version_info >= (2, 6):
class MultiprocessingTests(unittest.TestCase): class MultiprocessingTests(unittest.TestCase):
layer = ZODB.tests.util.MininalTestLayer('work_with_multiprocessing')
def test_work_with_multiprocessing(self): def test_work_with_multiprocessing(self):
"Client storage should work with multi-processing." "Client storage should work with multi-processing."
# Gaaa, zope.testing.runner.FakeInputContinueGenerator has no close
if not hasattr(sys.stdin, 'close'):
sys.stdin.close = lambda : None
self.globs = {} self.globs = {}
forker.setUp(self) forker.setUp(self)
addr, adminaddr = self.globs['start_server']() addr, adminaddr = self.globs['start_server']()
...@@ -1364,7 +1370,6 @@ def test_suite(): ...@@ -1364,7 +1370,6 @@ def test_suite():
# unit test layer # unit test layer
zeo = unittest.TestSuite() zeo = unittest.TestSuite()
zeo.addTest(unittest.makeSuite(ZODB.tests.util.AAAA_Test_Runner_Hack)) zeo.addTest(unittest.makeSuite(ZODB.tests.util.AAAA_Test_Runner_Hack))
zeo.addTest(unittest.makeSuite(MultiprocessingTests))
zeo.addTest(doctest.DocTestSuite( zeo.addTest(doctest.DocTestSuite(
setUp=forker.setUp, tearDown=zope.testing.setupstack.tearDown)) setUp=forker.setUp, tearDown=zope.testing.setupstack.tearDown))
zeo.addTest(doctest.DocTestSuite(ZEO.tests.IterationTests, zeo.addTest(doctest.DocTestSuite(ZEO.tests.IterationTests,
...@@ -1388,6 +1393,8 @@ def test_suite(): ...@@ -1388,6 +1393,8 @@ def test_suite():
zeo.layer = ZODB.tests.util.MininalTestLayer('testZeo-misc') zeo.layer = ZODB.tests.util.MininalTestLayer('testZeo-misc')
suite.addTest(zeo) suite.addTest(zeo)
suite.addTest(unittest.makeSuite(MultiprocessingTests))
# Put the heavyweights in their own layers # Put the heavyweights in their own layers
for klass in slow_test_classes: for klass in slow_test_classes:
sub = unittest.makeSuite(klass, "check") sub = unittest.makeSuite(klass, "check")
......
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