Correct issues with integration test race conditions

Author: BryanFauble

synapseclient/models/mixins/access_control.py

@@ -601,19 +601,19 @@ async def _delete_current_entity_acl(
             None
         """
 
-        if not dry_run:
-            await benefactor_tracker.track_entity_benefactor([self.id], client)
+        await benefactor_tracker.track_entity_benefactor([self.id], client)
 
+        if dry_run:
+            affected_entities = []
             if benefactor_tracker.will_acl_deletion_affect_others(self.id):
                 affected_entities = benefactor_tracker.benefactor_children.get(
                     self.id, []
                 )
+            if affected_entities:
                 client.logger.info(
                     f"Deleting ACL for entity {self.id} will affect {len(affected_entities)} "
                     f"child entities that inherit from it: {affected_entities}"
                 )
-
-        if dry_run:
             return
 
         try:

tests/integration/conftest.py

@@ -90,14 +90,6 @@ def syn_with_logger(request) -> Synapse:
     syn.logger = logging.getLogger(DEFAULT_LOGGER_NAME)
     syn.login(profile=os.getenv("SYNAPSE_PROFILE", "default"))
 
-    # set the working directory to a temp directory
-    _old_working_directory = os.getcwd()
-    os.chdir(working_directory)
-
-    def teardown() -> None:
-        os.chdir(_old_working_directory)
-
-    request.addfinalizer(teardown)
     return syn