tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Fix TestMixin

This commit is contained in:
Jean-Paul Calderone 2019-03-07 18:25:31 -05:00
parent e26895b149
commit afe97fdd8c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/test/common_util.py
View File

@ -177,7 +177,6 @@ class TestMixin(SignalMixin):
to without access to real randomness and real time.time from the to without access to real randomness and real time.time from the
code under test code under test
""" """
SignalMixin.setUp(self)
self.repeatable = repeatable self.repeatable = repeatable
if self.repeatable: if self.repeatable:
import repeatable_random import repeatable_random
@ -186,13 +185,14 @@ class TestMixin(SignalMixin):
self.teststarttime = time.realtime() self.teststarttime = time.realtime()
else: else:
self.teststarttime = time.time() self.teststarttime = time.time()
return super(TestMixin, self).setUp()
def tearDown(self): def tearDown(self):
SignalMixin.tearDown(self)
if self.repeatable: if self.repeatable:
import repeatable_random import repeatable_random
repeatable_random.restore_non_repeatability() repeatable_random.restore_non_repeatability()
self.clean_pending(required_to_quiesce=True) self.clean_pending(required_to_quiesce=True)
return super(TestMixin, self).tearDown()
def clean_pending(self, dummy=None, required_to_quiesce=True): def clean_pending(self, dummy=None, required_to_quiesce=True):
""" """