a

test/bases.py

@@ -1,4 +1,3 @@
-import sys
 import typing
 import unittest
 from argparse import Namespace
@@ -108,36 +107,11 @@ class WorldTestBase(unittest.TestCase):
     game: typing.ClassVar[str]  # define game name in subclass, example "Secret of Evermore"
     auto_construct: typing.ClassVar[bool] = True
     """ automatically set up a world for each test in this class """
-    memory_leak_tested: typing.ClassVar[bool] = False
-    """ remember if memory leak test was already done for this class """
 
     def setUp(self) -> None:
         if self.auto_construct:
             self.world_setup()
 
-    def tearDown(self) -> None:
-        if self.__class__.memory_leak_tested or not self.options or not self.constructed or \
-                sys.version_info < (3, 11, 0):  # the leak check in tearDown fails in py<3.11 for an unknown reason
-            # only run memory leak test once per class, only for constructed with non-default options
-            # default options will be tested in test/general
-            super().tearDown()
-            return
-
-        import gc
-        import weakref
-        weak = weakref.ref(self.multiworld)
-        for attr_name in dir(self):  # delete all direct references to MultiWorld and World
-            attr: object = typing.cast(object, getattr(self, attr_name))
-            if type(attr) is MultiWorld or isinstance(attr, AutoWorld.World):
-                delattr(self, attr_name)
-        state_cache: typing.Optional[typing.Dict[typing.Any, typing.Any]] = getattr(self, "_state_cache", None)
-        if state_cache is not None:  # in case of multiple inheritance with TestBase, we need to clear its cache
-            state_cache.clear()
-        gc.collect()
-        self.__class__.memory_leak_tested = True
-        self.assertFalse(weak(), f"World {getattr(self, 'game', '')} leaked MultiWorld object")
-        super().tearDown()
-
     def world_setup(self, seed: typing.Optional[int] = None) -> None:
         if type(self) is WorldTestBase or \
                 (hasattr(WorldTestBase, self._testMethodName)
@@ -310,7 +284,7 @@ class WorldTestBase(unittest.TestCase):
 
         # basically a shortened reimplementation of this method from core, in order to force the check is done
         def fulfills_accessibility() -> bool:
-            locations = list(self.multiworld.get_locations(1))
+            locations = self.multiworld.get_locations(1).copy()
             state = CollectionState(self.multiworld)
             while locations:
                 sphere: typing.List[Location] = []

test/general/test_fill.py

@@ -455,8 +455,8 @@ class TestFillRestrictive(unittest.TestCase):
         location.place_locked_item(item)
         multi_world.state.sweep_for_events()
         multi_world.state.sweep_for_events()
-        self.assertTrue(multi_world.state.prog_items[item.player][item.name], "Sweep did not collect - Test flawed")
-        self.assertEqual(multi_world.state.prog_items[item.player][item.name], 1, "Sweep collected multiple times")
+        self.assertTrue(multi_world.state.prog_items[item.name, item.player], "Sweep did not collect - Test flawed")
+        self.assertEqual(multi_world.state.prog_items[item.name, item.player], 1, "Sweep collected multiple times")
 
     def test_correct_item_instance_removed_from_pool(self):
         """Test that a placed item gets removed from the submitted pool"""

test/general/test_host_yaml.py

@@ -16,7 +16,7 @@ class TestIDs(unittest.TestCase):
 
     def test_utils_in_yaml(self) -> None:
         """Tests that the auto generated host.yaml has default settings in it"""
-        for option_key, option_set in Settings(None).items():
+        for option_key, option_set in Utils.get_default_options().items():
             with self.subTest(option_key):
                 self.assertIn(option_key, self.yaml_options)
                 for sub_option_key in option_set:
@@ -24,7 +24,7 @@ class TestIDs(unittest.TestCase):
 
     def test_yaml_in_utils(self) -> None:
         """Tests that the auto generated host.yaml shows up in reference calls"""
-        utils_options = Settings(None)
+        utils_options = Utils.get_default_options()
         for option_key, option_set in self.yaml_options.items():
             with self.subTest(option_key):
                 self.assertIn(option_key, utils_options)

test/general/test_locations.py

@@ -36,6 +36,7 @@ class TestBase(unittest.TestCase):
         for game_name, world_type in AutoWorldRegister.world_types.items():
             with self.subTest("Game", game_name=game_name):
                 multiworld = setup_solo_multiworld(world_type, gen_steps)
+                multiworld._recache()
                 region_count = len(multiworld.get_regions())
                 location_count = len(multiworld.get_locations())
 
@@ -45,12 +46,14 @@ class TestBase(unittest.TestCase):
                 self.assertEqual(location_count, len(multiworld.get_locations()),
                                  f"{game_name} modified locations count during rule creation")
 
+                multiworld._recache()
                 call_all(multiworld, "generate_basic")
                 self.assertEqual(region_count, len(multiworld.get_regions()),
                                  f"{game_name} modified region count during generate_basic")
                 self.assertGreaterEqual(location_count, len(multiworld.get_locations()),
                                         f"{game_name} modified locations count during generate_basic")
 
+                multiworld._recache()
                 call_all(multiworld, "pre_fill")
                 self.assertEqual(region_count, len(multiworld.get_regions()),
                                  f"{game_name} modified region count during pre_fill")