From 1d7841914d1081fa6f0e6eab1153942039a6187d Mon Sep 17 00:00:00 2001 From: alwaysintreble Date: Wed, 8 Nov 2023 19:14:28 -0600 Subject: [PATCH] resolve test conflicts --- test/bases.py | 6 +++--- worlds/alttp/test/options/TestOpenPyramid.py | 2 +- worlds/messenger/test/test_shop.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/bases.py b/test/bases.py index 2054c2d18725..c45a0e879057 100644 --- a/test/bases.py +++ b/test/bases.py @@ -89,15 +89,15 @@ def _get_items(self, item_pool, all_except): items = self.multiworld.itempool[:] items = [item for item in items if item.name not in all_except and not ("Bottle" in item.name and "AnyBottle" in all_except)] - items.extend(ItemFactory(item_pool[0], 1)) + items.extend(ItemFactory(item_pool[0], self.multiworld.worlds[1])) else: - items = ItemFactory(item_pool[0], 1) + items = ItemFactory(item_pool[0], self.multiworld.worlds[1]) return self.get_state(items) def _get_items_partial(self, item_pool, missing_item): new_items = item_pool[0].copy() new_items.remove(missing_item) - items = ItemFactory(new_items, 1) + items = ItemFactory(new_items, self.multiworld.worlds[1]) return self.get_state(items) diff --git a/worlds/alttp/test/options/TestOpenPyramid.py b/worlds/alttp/test/options/TestOpenPyramid.py index e652422c9182..608314e92659 100644 --- a/worlds/alttp/test/options/TestOpenPyramid.py +++ b/worlds/alttp/test/options/TestOpenPyramid.py @@ -34,6 +34,6 @@ def testGanonGoalAccess(self): self.assertFalse(self.can_reach_entrance("Pyramid Hole")) self.collect_by_name(["Hammer", "Progressive Glove", "Moon Pearl"]) self.assertFalse(self.can_reach_entrance("Pyramid Hole")) - self.multiworld.state.collect(ItemFactory("Beat Agahnim 2", self.world)) + self.collect(ItemFactory("Beat Agahnim 2", self.multiworld.worlds[1])) self.assertTrue(self.can_reach_entrance("Pyramid Hole")) diff --git a/worlds/messenger/test/test_shop.py b/worlds/messenger/test/test_shop.py index bfd3b417a875..557cea74cde0 100644 --- a/worlds/messenger/test/test_shop.py +++ b/worlds/messenger/test/test_shop.py @@ -6,7 +6,7 @@ class ShopCostTest(MessengerTestBase): options = { - "shop_price": "random", + "shop_price": 350, "shuffle_shards": "true", } @@ -46,7 +46,7 @@ def test_strike(self) -> None: class ShopCostMinTest(ShopCostTest): options = { - "shop_price": "random", + "shop_price": 350, "shuffle_seals": "false", }