From ff0d9237236e1fa3fe0117a1d0296280ab630b17 Mon Sep 17 00:00:00 2001
From: "Amber H. Brown" <hawkowl@atleastfornow.net>
Date: Tue, 30 Jul 2019 02:54:33 +1000
Subject: [PATCH 1/2] remove it

---
 tests/unittest.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/unittest.py b/tests/unittest.py
index f5fae2131771..561cebc223a4 100644
--- a/tests/unittest.py
+++ b/tests/unittest.py
@@ -23,8 +23,6 @@
 
 from canonicaljson import json
 
-import twisted
-import twisted.logger
 from twisted.internet.defer import Deferred, succeed
 from twisted.python.threadpool import ThreadPool
 from twisted.trial import unittest
@@ -80,10 +78,6 @@ def __init__(self, methodName, *args, **kwargs):
 
         @around(self)
         def setUp(orig):
-            # enable debugging of delayed calls - this means that we get a
-            # traceback when a unit test exits leaving things on the reactor.
-            twisted.internet.base.DelayedCall.debug = True
-
             # if we're not starting in the sentinel logcontext, then to be honest
             # all future bets are off.
             if LoggingContext.current_context() is not LoggingContext.sentinel:

From 1f1f09c4fb5f2e646902260810d391c6637014e7 Mon Sep 17 00:00:00 2001
From: "Amber H. Brown" <hawkowl@atleastfornow.net>
Date: Tue, 30 Jul 2019 02:55:13 +1000
Subject: [PATCH 2/2] changelog

---
 changelog.d/5787.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5787.misc

diff --git a/changelog.d/5787.misc b/changelog.d/5787.misc
new file mode 100644
index 000000000000..ead0b04b6210
--- /dev/null
+++ b/changelog.d/5787.misc
@@ -0,0 +1 @@
+Remove DelayedCall debugging from the test suite, as it is no longer required in the vast majority of Synapse's tests.