From 1d9ecfa00f91d602073b56a64f9aa129b95a8c2e Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Mon, 11 Nov 2013 00:04:32 -0600 Subject: switch tests to use new battle starter --- tests/bootstrapping.py | 3 +-- tests/test_vba_battle.py | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/bootstrapping.py b/tests/bootstrapping.py index 986a20b..b71c19a 100644 --- a/tests/bootstrapping.py +++ b/tests/bootstrapping.py @@ -49,7 +49,6 @@ def bootstrap_trainer_battle(): cry.givepoke(224, 60, "OcTiLlErY") cry.givepoke(126, 87, "magmar") - # TODO: figure out a better way to start a trainer battle :( - runner.cry.start_trainer_battle_lamely() + cry.start_trainer_battle() return runner.cry.vba.state diff --git a/tests/test_vba_battle.py b/tests/test_vba_battle.py index be62fb5..e86b53c 100644 --- a/tests/test_vba_battle.py +++ b/tests/test_vba_battle.py @@ -40,6 +40,7 @@ class BattleTests(unittest.TestCase): # reset to whatever the bootstrapper created self.vba.state = self.bootstrap_state self.battle = Battle(emulator=self.cry) + self.battle.skip_start_text() def test_is_in_battle(self): self.assertTrue(self.battle.is_in_battle()) -- cgit v1.2.3