diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-11-11 00:04:32 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-11-11 00:04:32 -0600 |
| commit | 1d9ecfa00f91d602073b56a64f9aa129b95a8c2e (patch) | |
| tree | 82cb44b005abc2c44638aae13a2ed94fad5befff | |
| parent | 9249ffd2d01ec38ace0caf8d5b3d0f0a7cad23f2 (diff) | |
switch tests to use new battle starter
| -rw-r--r-- | tests/bootstrapping.py | 3 | ||||
| -rw-r--r-- | tests/test_vba_battle.py | 1 |
2 files changed, 2 insertions, 2 deletions
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()) |