From afe97fdd8c4cf0f5741532c3c0ec6415b79f4204 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 7 Mar 2019 18:25:31 -0500
Subject: [PATCH] Fix TestMixin

---
 src/allmydata/test/common_util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/allmydata/test/common_util.py b/src/allmydata/test/common_util.py
index 94ab8ee59..df3df808e 100644
--- a/src/allmydata/test/common_util.py
+++ b/src/allmydata/test/common_util.py
@@ -177,7 +177,6 @@ class TestMixin(SignalMixin):
             to without access to real randomness and real time.time from the
             code under test
         """
-        SignalMixin.setUp(self)
         self.repeatable = repeatable
         if self.repeatable:
             import repeatable_random
@@ -186,13 +185,14 @@ class TestMixin(SignalMixin):
             self.teststarttime = time.realtime()
         else:
             self.teststarttime = time.time()
+        return super(TestMixin, self).setUp()
 
     def tearDown(self):
-        SignalMixin.tearDown(self)
         if self.repeatable:
             import repeatable_random
             repeatable_random.restore_non_repeatability()
         self.clean_pending(required_to_quiesce=True)
+        return super(TestMixin, self).tearDown()
 
     def clean_pending(self, dummy=None, required_to_quiesce=True):
         """