From 6bfec47c477cb14fd937904dbf76a7e50fe62804 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Tue, 14 Jul 2026 10:46:28 +0100
Subject: [PATCH] Revert "Fix flaky 3PID inhibit error unit tests" (#19916)

---
 changelog.d/19913.misc             |  1 -
 changelog.d/19916.misc             |  1 +
 tests/rest/client/test_account.py  | 16 +++++++---------
 tests/rest/client/test_register.py |  7 ++++---
 tests/server.py                    |  5 +----
 tests/unittest.py                  |  4 ----
 6 files changed, 13 insertions(+), 21 deletions(-)
 delete mode 100644 changelog.d/19913.misc
 create mode 100644 changelog.d/19916.misc

diff --git a/changelog.d/19913.misc b/changelog.d/19913.misc
deleted file mode 100644
index 31b5a4d37b..0000000000
--- a/changelog.d/19913.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix a flake in 3PID inhibit error unit tests, causing occasional failures in CI.
\ No newline at end of file
diff --git a/changelog.d/19916.misc b/changelog.d/19916.misc
new file mode 100644
index 0000000000..aeec5ae412
--- /dev/null
+++ b/changelog.d/19916.misc
@@ -0,0 +1 @@
+Add note to 3PID email token request unit tests that the endpoint being tested can have an expected, artificial delay of up to 1s.
\ No newline at end of file
diff --git a/tests/rest/client/test_account.py b/tests/rest/client/test_account.py
index 158d7f33f0..c0494c606f 100644
--- a/tests/rest/client/test_account.py
+++ b/tests/rest/client/test_account.py
@@ -325,13 +325,8 @@ class PasswordResetTestCase(unittest.HomeserverTestCase):
         email = "test@example.com"
 
         client_secret = "foobar"
-        session_id = self._request_token(
-            email,
-            client_secret,
-            # The endpoint intentionally adds up to 1000ms of jitter to avoid
-            # leaking whether the email address is bound to an account.
-            timeout_ms=3000,
-        )
+
+        session_id = self._request_token(email, client_secret)
 
         self.assertIsNotNone(session_id)
 
@@ -370,18 +365,21 @@ class PasswordResetTestCase(unittest.HomeserverTestCase):
         client_secret: str,
         ip: str = "127.0.0.1",
         next_link: str | None = None,
-        timeout_ms: int = 1000,
     ) -> str:
         body = {"client_secret": client_secret, "email": email, "send_attempt": 1}
         if next_link is not None:
             body["next_link"] = next_link
+
         channel = self.make_request(
             "POST",
             b"account/password/email/requestToken",
             body,
             client_ip=ip,
-            timeout_ms=timeout_ms,
+            await_result=False,
         )
+        # Note: The endpoint intentionally adds up to 1000ms of jitter to avoid
+        # leaking whether the email address is bound to an account.
+        channel.await_result(timeout_ms=1000)
 
         if channel.code != 200:
             raise HttpResponseException(
diff --git a/tests/rest/client/test_register.py b/tests/rest/client/test_register.py
index a9f3ac2462..1b04ea9d5c 100644
--- a/tests/rest/client/test_register.py
+++ b/tests/rest/client/test_register.py
@@ -753,10 +753,11 @@ class RegisterRestServletTestCase(unittest.HomeserverTestCase):
             "POST",
             b"register/email/requestToken",
             {"client_secret": "foobar", "email": email, "send_attempt": 1},
-            # The endpoint intentionally adds up to 1000ms of jitter to avoid
-            # leaking whether the email address is already bound to an account.
-            timeout_ms=3000,
+            await_result=False,
         )
+        # Note: The endpoint intentionally adds up to 1000ms of jitter to avoid
+        # leaking whether the email address is bound to an account.
+        channel.await_result(timeout_ms=1000)
         self.assertEqual(200, channel.code, channel.result)
 
         self.assertIsNotNone(channel.json_body.get("sid"))
diff --git a/tests/server.py b/tests/server.py
index 15a7661c34..052f76d755 100644
--- a/tests/server.py
+++ b/tests/server.py
@@ -459,7 +459,6 @@ def make_request(
     await_result: bool = True,
     custom_headers: Iterable[CustomHeaderType] | None = None,
     client_ip: str = "127.0.0.1",
-    timeout_ms: int = 1000,
 ) -> FakeChannel:
     """
     Make a web request using the given method, path and content, and render it
@@ -488,8 +487,6 @@ def make_request(
         custom_headers: (name, value) pairs to add as request headers
         client_ip: The IP to use as the requesting IP. Useful for testing
             ratelimiting.
-        timeout_ms: if `await_result` is `True`, the amount of time to wait on
-            the request before timing out. Ignored otherwise.
 
     Returns:
         channel
@@ -574,7 +571,7 @@ def make_request(
     req.requestReceived(method, path, b"1.1")
 
     if await_result:
-        channel.await_result(timeout_ms=timeout_ms)
+        channel.await_result()
 
     return channel
 
diff --git a/tests/unittest.py b/tests/unittest.py
index 202f7120ef..3d130c1d77 100644
--- a/tests/unittest.py
+++ b/tests/unittest.py
@@ -571,7 +571,6 @@ class HomeserverTestCase(TestCase):
         await_result: bool = True,
         custom_headers: Iterable[CustomHeaderType] | None = None,
         client_ip: str = "127.0.0.1",
-        timeout_ms: int = 1000,
     ) -> FakeChannel:
         """
         Create a SynapseRequest at the path using the method and containing the
@@ -600,8 +599,6 @@ class HomeserverTestCase(TestCase):
 
             client_ip: The IP to use as the requesting IP. Useful for testing
                 ratelimiting.
-            timeout_ms: if `await_result` is `True`, the amount of time to wait on
-                the request before timing out. Ignored otherwise.
 
         Returns:
             The FakeChannel object which stores the result of the request.
@@ -621,7 +618,6 @@ class HomeserverTestCase(TestCase):
             await_result,
             custom_headers,
             client_ip,
-            timeout_ms,
         )
 
     def setup_test_homeserver(