Skip to content

Commit

Permalink
Split up the misc ZEO test layer
Browse files Browse the repository at this point in the history
- To make tests run faster with j99, and

- To isolate some tests that often seem to fail spuriously but pass
  when run by themselves.
  • Loading branch information
Jim Fulton committed Jun 27, 2016
1 parent 7cb6e87 commit 5fcd383
Showing 1 changed file with 21 additions and 5 deletions.
26 changes: 21 additions & 5 deletions src/ZEO/tests/testZEO.py
Expand Up @@ -1566,8 +1566,6 @@ def pack(self, t=None, referencesf=None):
def test_suite():
suite = unittest.TestSuite()

# Collect misc tests into their own layer to reduce size of
# unit test layer
zeo = unittest.TestSuite()
zeo.addTest(unittest.makeSuite(ZODB.tests.util.AAAA_Test_Runner_Hack))
patterns = [
Expand Down Expand Up @@ -1598,12 +1596,16 @@ def test_suite():
"ClientDisconnected"),
)),
))
zeo.layer = ZODB.tests.util.MininalTestLayer('testZeo-misc')
suite.addTest(zeo)

zeo = unittest.TestSuite()
zeo.addTest(
doctest.DocFileSuite(
'zeo-fan-out.test', 'zdoptions.test',
'zdoptions.test',
'drop_cache_rather_than_verify.txt', 'client-config.test',
'protocols.test', 'zeo_blob_cache.test', 'invalidation-age.txt',
'dynamic_server_ports.test', 'new_addr.test', '../nagios.rst',
'dynamic_server_ports.test', '../nagios.rst',
setUp=forker.setUp, tearDown=zope.testing.setupstack.tearDown,
checker=renormalizing.RENormalizing(patterns),
globs={'print_function': print_function},
Expand All @@ -1616,9 +1618,23 @@ def test_suite():
))
for klass in quick_test_classes:
zeo.addTest(unittest.makeSuite(klass, "check"))
zeo.layer = ZODB.tests.util.MininalTestLayer('testZeo-misc')
zeo.layer = ZODB.tests.util.MininalTestLayer('testZeo-misc2')
suite.addTest(zeo)

# tests that often fail, maybe if they have their own layers
for name in 'zeo-fan-out.test', 'new_addr.test':
zeo = unittest.TestSuite()
zeo.addTest(
doctest.DocFileSuite(
name,
setUp=forker.setUp, tearDown=zope.testing.setupstack.tearDown,
checker=renormalizing.RENormalizing(patterns),
globs={'print_function': print_function},
),
)
zeo.layer = ZODB.tests.util.MininalTestLayer('testZeo-' + name)
suite.addTest(zeo)

suite.addTest(unittest.makeSuite(MultiprocessingTests))

# Put the heavyweights in their own layers
Expand Down

0 comments on commit 5fcd383

Please sign in to comment.