test_runner: Move bounce_key_prefix_for_testing to ZulipTestCase.

Signed-off-by: Anders Kaseorg <anders@zulip.com>

zerver/lib/test_classes.py

@@ -32,7 +32,9 @@ from zerver.lib.actions import (
     check_send_stream_message,
     gather_subscriptions,
 )
+from zerver.lib.cache import bounce_key_prefix_for_testing
 from zerver.lib.initial_password import initial_password
+from zerver.lib.rate_limiter import bounce_redis_key_prefix_for_testing
 from zerver.lib.sessions import get_session_dict_user
 from zerver.lib.stream_subscription import get_stream_subscriptions_for_user
 from zerver.lib.streams import (
@@ -93,6 +95,10 @@ class ZulipTestCase(TestCase):
         super().setUp()
         self.API_KEYS: Dict[str, str] = {}
 
+        test_name = self.id()
+        bounce_key_prefix_for_testing(test_name)
+        bounce_redis_key_prefix_for_testing(test_name)
+
     def tearDown(self) -> None:
         super().tearDown()
         # Important: we need to clear event queues to avoid leaking data to future tests.

zerver/lib/test_runner.py

@@ -23,8 +23,6 @@ from scripts.lib.zulip_tools import (
     get_or_create_dev_uuid_var_path,
 )
 from zerver.lib import test_helpers
-from zerver.lib.cache import bounce_key_prefix_for_testing
-from zerver.lib.rate_limiter import bounce_redis_key_prefix_for_testing
 from zerver.lib.sqlalchemy_utils import get_sqlalchemy_connection
 from zerver.lib.test_helpers import append_instrumentation_data, write_instrumentation_reports
 
@@ -48,10 +46,6 @@ _worker_id = 0  # Used to identify the worker process.
 
 def run_test(test: TestCase, result: TestResult) -> bool:
     failed = False
-    test_name = test.id()
-
-    bounce_key_prefix_for_testing(test_name)
-    bounce_redis_key_prefix_for_testing(test_name)
 
     try:
         test._pre_setup()