ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-03-11 06:43:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch from the decorator to EliotLoggedRunTest

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-03-07 18:18:22 -05:00
parent 51bee19b23
commit 1b6a5b60bf
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/allmydata/test/common.py
View File

@ -41,7 +41,7 @@ import allmydata.test.common_util as testutil
from allmydata.immutable.upload import Uploader from allmydata.immutable.upload import Uploader
from .eliotutil import ( from .eliotutil import (
eliot_logged_test, EliotLoggedRunTest,
) )
@ -853,10 +853,6 @@ class _TestCaseMixin(object):
* trial-compatible mktemp method * trial-compatible mktemp method
* unittest2-compatible assertRaises helper * unittest2-compatible assertRaises helper
""" """
@eliot_logged_test
def run(self, result):
return super(TestCase, self).run(result)
def setUp(self): def setUp(self):
# Restore the original temporary directory. Node ``init_tempdir`` # Restore the original temporary directory. Node ``init_tempdir``
# mangles it and many tests manage to get that method called. # mangles it and many tests manage to get that method called.
@ -882,7 +878,9 @@ class SyncTestCase(_TestCaseMixin, TestCase):
A ``TestCase`` which can run tests that may return an already-fired A ``TestCase`` which can run tests that may return an already-fired
``Deferred``. ``Deferred``.
""" """
run_tests_with = SynchronousDeferredRunTest run_tests_with = EliotLoggedRunTest.make_factory(
SynchronousDeferredRunTest,
)
class AsyncTestCase(_TestCaseMixin, TestCase): class AsyncTestCase(_TestCaseMixin, TestCase):
@ -890,4 +888,7 @@ class AsyncTestCase(_TestCaseMixin, TestCase):
A ``TestCase`` which can run tests that may return a Deferred that will A ``TestCase`` which can run tests that may return a Deferred that will
only fire if the global reactor is running. only fire if the global reactor is running.
""" """
run_tests_with = AsynchronousDeferredRunTest run_tests_with = EliotLoggedRunTest.make_factory(
AsynchronousDeferredRunTest.make_factory(timeout=60.0),
)