Update unit tests configuration settings

changelog.d/14568.misc

@@ -0,0 +1 @@
+Update some unit tests configuration that are related to workers.

tests/events/test_presence_router.py

@@ -162,7 +162,10 @@ def prepare(self, reactor, clock, homeserver):
                     },
                 }
             },
-            "send_federation": True,
+            # Default test case disables federation sending. Setting
+            # 'federation_sender_instances' to None turns it back on for the main
+            # process
+            "federation_sender_instances": None,
         }
     )
     def test_receiving_all_presence_legacy(self):
@@ -180,7 +183,10 @@ def test_receiving_all_presence_legacy(self):
                     },
                 },
             ],
-            "send_federation": True,
+            # Default test case disables federation sending. Setting
+            # 'federation_sender_instances' to None turns it back on for the main
+            # process
+            "federation_sender_instances": None,
         }
     )
     def test_receiving_all_presence(self):
@@ -290,7 +296,10 @@ def receiving_all_presence_test_body(self):
                     },
                 }
             },
-            "send_federation": True,
+            # Default test case disables federation sending. Setting
+            # 'federation_sender_instances' to None turns it back on for the main
+            # process
+            "federation_sender_instances": None,
         }
     )
     def test_send_local_online_presence_to_with_module_legacy(self):
@@ -310,7 +319,10 @@ def test_send_local_online_presence_to_with_module_legacy(self):
                     },
                 },
             ],
-            "send_federation": True,
+            # Default test case disables federation sending. Setting
+            # 'federation_sender_instances' to None turns it back on for the main
+            # process
+            "federation_sender_instances": None,
         }
     )
     def test_send_local_online_presence_to_with_module(self):

tests/federation/test_federation_catch_up.py

@@ -79,7 +79,10 @@ def get_destination_room(self, room: str, destination: str = "host2") -> dict:
         )[0]
         return {"event_id": event_id, "stream_ordering": stream_ordering}
 
-    @override_config({"send_federation": True})
+    # Default test case disables federation sending. Setting
+    # 'federation_sender_instances' to None turns it back on for the main
+    # process
+    @override_config({"federation_sender_instances": None})
     def test_catch_up_destination_rooms_tracking(self):
         """
         Tests that we populate the `destination_rooms` table as needed.
@@ -105,7 +108,10 @@ def test_catch_up_destination_rooms_tracking(self):
         self.assertEqual(row_2["event_id"], event_id_2)
         self.assertEqual(row_1["stream_ordering"], row_2["stream_ordering"] - 1)
 
-    @override_config({"send_federation": True})
+    # Default test case disables federation sending. Setting
+    # 'federation_sender_instances' to None turns it back on for the main
+    # process
+    @override_config({"federation_sender_instances": None})
     def test_catch_up_last_successful_stream_ordering_tracking(self):
         """
         Tests that we populate the `destination_rooms` table as needed.
@@ -163,7 +169,10 @@ def test_catch_up_last_successful_stream_ordering_tracking(self):
             "Send succeeded but not marked as last_successful_stream_ordering",
         )
 
-    @override_config({"send_federation": True})  # critical to federate
+    # Default test case disables federation sending. Setting
+    # 'federation_sender_instances' to None turns it back on for the main
+    # process
+    @override_config({"federation_sender_instances": None})  # critical to federate
     def test_catch_up_from_blank_state(self):
         """
         Runs an overall test of federation catch-up from scratch.
@@ -260,7 +269,10 @@ async def fake_send(
 
         return per_dest_queue, results_list
 
-    @override_config({"send_federation": True})
+    # Default test case disables federation sending. Setting
+    # 'federation_sender_instances' to None turns it back on for the main
+    # process
+    @override_config({"federation_sender_instances": None})
     def test_catch_up_loop(self):
         """
         Tests the behaviour of _catch_up_transmission_loop.
@@ -325,7 +337,10 @@ def test_catch_up_loop(self):
             event_5.internal_metadata.stream_ordering,
         )
 
-    @override_config({"send_federation": True})
+    # Default test case disables federation sending. Setting
+    # 'federation_sender_instances' to None turns it back on for the main
+    # process
+    @override_config({"federation_sender_instances": None})
     def test_catch_up_on_synapse_startup(self):
         """
         Tests the behaviour of get_catch_up_outstanding_destinations and
@@ -424,7 +439,10 @@ def wake_destination_track(destination):
         # - all destinations are woken exactly once; they appear once in woken.
         self.assertCountEqual(woken, server_names[:-1])
 
-    @override_config({"send_federation": True})
+    # Default test case disables federation sending. Setting
+    # 'federation_sender_instances' to None turns it back on for the main
+    # process
+    @override_config({"federation_sender_instances": None})
     def test_not_latest_event(self):
         """Test that we send the latest event in the room even if its not ours."""
 

tests/federation/test_federation_sender.py

@@ -40,7 +40,10 @@ def make_homeserver(self, reactor, clock):
 
         return hs
 
-    @override_config({"send_federation": True})
+    # Default test case disables federation sending. Setting
+    # 'federation_sender_instances' to None turns it back on for the main
+    # process
+    @override_config({"federation_sender_instances": None})
     def test_send_receipts(self):
         mock_send_transaction = (
             self.hs.get_federation_transport_client().send_transaction
@@ -83,7 +86,10 @@ def test_send_receipts(self):
             ],
         )
 
-    @override_config({"send_federation": True})
+    # Default test case disables federation sending. Setting
+    # 'federation_sender_instances' to None turns it back on for the main
+    # process
+    @override_config({"federation_sender_instances": None})
     def test_send_receipts_with_backoff(self):
         """Send two receipts in quick succession; the second should be flushed, but
         only after 20ms"""
@@ -184,7 +190,10 @@ def make_homeserver(self, reactor, clock):
 
     def default_config(self):
         c = super().default_config()
-        c["send_federation"] = True
+        # Default test case disables federation sending. Setting
+        # 'federation_sender_instances' to None turns it back on for the main
+        # process
+        c["federation_sender_instances"] = None
         return c
 
     def prepare(self, reactor, clock, hs):

tests/handlers/test_presence.py

@@ -992,7 +992,10 @@ def make_homeserver(self, reactor, clock):
 
     def default_config(self):
         config = super().default_config()
-        config["send_federation"] = True
+        # Default test case disables federation sending. Setting
+        # 'federation_sender_instances' to None turns it back on for the main
+        # process
+        config["federation_sender_instances"] = None
         return config
 
     def prepare(self, reactor, clock, hs):

tests/handlers/test_typing.py

@@ -200,7 +200,10 @@ def test_started_typing_local(self) -> None:
             ],
         )
 
-    @override_config({"send_federation": True})
+    # Default test case disables federation sending. Setting
+    # 'federation_sender_instances' to None turns it back on for the main
+    # process
+    @override_config({"federation_sender_instances": None})
     def test_started_typing_remote_send(self) -> None:
         self.room_members = [U_APPLE, U_ONION]
 
@@ -305,7 +308,10 @@ def test_started_typing_remote_recv_not_in_room(self) -> None:
         self.assertEqual(events[0], [])
         self.assertEqual(events[1], 0)
 
-    @override_config({"send_federation": True})
+    # Default test case disables federation sending. Setting
+    # 'federation_sender_instances' to None turns it back on for the main
+    # process
+    @override_config({"federation_sender_instances": None})
     def test_stopped_typing(self) -> None:
         self.room_members = [U_APPLE, U_BANANA, U_ONION]
 

tests/handlers/test_user_directory.py

@@ -56,7 +56,9 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
 
     def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer:
         config = self.default_config()
-        config["update_user_directory"] = True
+        # Remove the value that disables updating the user directory, as that function
+        # is needed below.
+        config.pop("update_user_directory_from_worker")
 
         self.appservice = ApplicationService(
             token="i_am_an_app_service",
@@ -1045,7 +1047,9 @@ class TestUserDirSearchDisabled(unittest.HomeserverTestCase):
 
     def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer:
         config = self.default_config()
-        config["update_user_directory"] = True
+        # Remove the value that disables updating the user directory, as that function
+        # is needed below. It will be force disabled later
+        config.pop("update_user_directory_from_worker")
         hs = self.setup_test_homeserver(config=config)
 
         self.config = hs.config

tests/module_api/test_api.py

@@ -336,7 +336,10 @@ def test_send_local_online_presence_to(self):
         # Test sending local online presence to users from the main process
         _test_sending_local_online_presence_to_local_user(self, test_with_workers=False)
 
-    @override_config({"send_federation": True})
+    # Default test case disables federation sending. Setting
+    # 'federation_sender_instances' to None turns it back on for the main
+    # process
+    @override_config({"federation_sender_instances": None})
     def test_send_local_online_presence_to_federation(self):
         """Tests that send_local_presence_to_users sends local online presence to remote users."""
         # Create a user who will send presence updates

tests/push/test_email.py

@@ -66,7 +66,6 @@ def make_homeserver(self, reactor, clock):
             "riot_base_url": None,
         }
         config["public_baseurl"] = "http://aaa"
-        config["start_pushers"] = True
 
         hs = self.setup_test_homeserver(config=config)
 

tests/push/test_http.py

@@ -43,7 +43,6 @@ class HTTPPusherTests(HomeserverTestCase):
 
     def default_config(self) -> Dict[str, Any]:
         config = super().default_config()
-        config["start_pushers"] = True
         return config
 
     def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer:

tests/replication/_base.py

@@ -307,7 +307,7 @@ def make_worker_hs(
         stream to the master HS.
 
         Args:
-            worker_app: Type of worker, e.g. `synapse.app.federation_sender`.
+            worker_app: Type of worker, e.g. `synapse.app.generic_worker`.
             extra_config: Any extra config to use for this instances.
             **kwargs: Options that get passed to `self.setup_test_homeserver`,
                 useful to e.g. pass some mocks for things like `federation_http_client`

tests/replication/tcp/streams/test_federation.py

@@ -22,9 +22,9 @@ class FederationStreamTestCase(BaseStreamTestCase):
     def _get_worker_hs_config(self) -> dict:
         # enable federation sending on the worker
         config = super()._get_worker_hs_config()
-        # TODO: make it so we don't need both of these
-        config["send_federation"] = False
-        config["worker_app"] = "synapse.app.federation_sender"
+        # The 'worker_app' is declared to be 'synapse.app.generic_worker' in super()
+        # Workers with no name default to whatever is in the 'worker_app'
+        config["federation_sender_instances"] = ["synapse.app.generic_worker"]
         return config
 
     def test_catchup(self):

tests/replication/test_auth.py

@@ -38,7 +38,7 @@ def make_homeserver(self, reactor, clock):
 
     def _get_worker_hs_config(self) -> dict:
         config = self.default_config()
-        config["worker_app"] = "synapse.app.client_reader"
+        config["worker_app"] = "synapse.app.generic_worker"
         config["worker_replication_host"] = "testserv"
         config["worker_replication_http_port"] = "8765"
 
@@ -53,7 +53,7 @@ def _test_register(self) -> FakeChannel:
         4. Return the final request.
 
         """
-        worker_hs = self.make_worker_hs("synapse.app.client_reader")
+        worker_hs = self.make_worker_hs("synapse.app.generic_worker")
         site = self._hs_to_site[worker_hs]
 
         channel_1 = make_request(

tests/replication/test_client_reader_shard.py

@@ -22,20 +22,20 @@
 
 
 class ClientReaderTestCase(BaseMultiWorkerStreamTestCase):
-    """Test using one or more client readers for registration."""
+    """Test using one or more generic workers for registration."""
 
     servlets = [register.register_servlets]
 
     def _get_worker_hs_config(self) -> dict:
         config = self.default_config()
-        config["worker_app"] = "synapse.app.client_reader"
+        config["worker_app"] = "synapse.app.generic_worker"
         config["worker_replication_host"] = "testserv"
         config["worker_replication_http_port"] = "8765"
         return config
 
     def test_register_single_worker(self):
-        """Test that registration works when using a single client reader worker."""
-        worker_hs = self.make_worker_hs("synapse.app.client_reader")
+        """Test that registration works when using a single generic worker."""
+        worker_hs = self.make_worker_hs("synapse.app.generic_worker")
         site = self._hs_to_site[worker_hs]
 
         channel_1 = make_request(
@@ -64,9 +64,9 @@ def test_register_single_worker(self):
         self.assertEqual(channel_2.json_body["user_id"], "@user:test")
 
     def test_register_multi_worker(self):
-        """Test that registration works when using multiple client reader workers."""
-        worker_hs_1 = self.make_worker_hs("synapse.app.client_reader")
-        worker_hs_2 = self.make_worker_hs("synapse.app.client_reader")
+        """Test that registration works when using multiple generic workers."""
+        worker_hs_1 = self.make_worker_hs("synapse.app.generic_worker")
+        worker_hs_2 = self.make_worker_hs("synapse.app.generic_worker")
 
         site_1 = self._hs_to_site[worker_hs_1]
         channel_1 = make_request(

tests/replication/test_federation_ack.py

@@ -25,8 +25,9 @@
 class FederationAckTestCase(HomeserverTestCase):
     def default_config(self) -> dict:
         config = super().default_config()
-        config["worker_app"] = "synapse.app.federation_sender"
-        config["send_federation"] = False
+        config["worker_app"] = "synapse.app.generic_worker"
+        # Workers with no name default to whatever is in 'worker_app'
+        config["federation_sender_instances"] = ["synapse.app.generic_worker"]
         return config
 
     def make_homeserver(self, reactor, clock):