diff --git a/test/general/__init__.py b/test/general/__init__.py index 53be7afacf7b..8afd84976540 100644 --- a/test/general/__init__.py +++ b/test/general/__init__.py @@ -1,8 +1,6 @@ from argparse import Namespace from typing import List, Optional, Tuple, Type, Union -from tornado.gen import multi - from BaseClasses import CollectionState, Item, ItemClassification, Location, MultiWorld, Region from worlds import network_data_package from worlds.AutoWorld import World, call_all @@ -75,7 +73,7 @@ def generate_test_multiworld(players: int = 1) -> MultiWorld: :return: The generated test multiworld """ multiworld = setup_multiworld([TestWorld] * players, seed=0) - multiworld.regions += [Region("Menu", player_id, multiworld) for player_id in multiworld.player_ids] + multiworld.regions += [Region("Menu", player_id + 1, multiworld) for player_id in range(players)] return multiworld diff --git a/test/general/test_helpers.py b/test/general/test_helpers.py index f619d41dfd54..be8473975638 100644 --- a/test/general/test_helpers.py +++ b/test/general/test_helpers.py @@ -2,7 +2,6 @@ from typing import Callable, Dict, Optional from BaseClasses import CollectionState, MultiWorld, Region -from test.general import TestWorld, setup_solo_multiworld class TestHelpers(unittest.TestCase): @@ -10,7 +9,10 @@ class TestHelpers(unittest.TestCase): player: int = 1 def setUp(self) -> None: - self.multiworld = setup_solo_multiworld(TestWorld, ()) + self.multiworld = MultiWorld(self.player) + self.multiworld.game[self.player] = "helper_test_game" + self.multiworld.player_name = {1: "Tester"} + self.multiworld.set_seed() def test_region_helpers(self) -> None: """Tests `Region.add_locations()` and `Region.add_exits()` have correct behavior"""