diff --git a/android_env/components/simulators/fake/fake_simulator.py b/android_env/components/simulators/fake/fake_simulator.py index 4209b17..fb85ac2 100644 --- a/android_env/components/simulators/fake/fake_simulator.py +++ b/android_env/components/simulators/fake/fake_simulator.py @@ -15,6 +15,7 @@ """Fake Simulator for testing AndroidEnv infrastructure.""" +import datetime import random import threading import time @@ -67,7 +68,7 @@ class FakeAdbController(adb_controller.AdbController): def execute_command( self, args: list[str], - timeout: float | None = None, + timeout: datetime.timedelta | float | None = None, device_specific: bool = True, ) -> bytes: """Returns fake output for adb commands.""" diff --git a/android_env/components/simulators/fake/fake_simulator_test.py b/android_env/components/simulators/fake/fake_simulator_test.py index 15d8640..e4c5433 100644 --- a/android_env/components/simulators/fake/fake_simulator_test.py +++ b/android_env/components/simulators/fake/fake_simulator_test.py @@ -15,6 +15,7 @@ """Tests for fake_simulator.""" +import datetime import re from absl.testing import absltest from android_env.components import config_classes @@ -74,8 +75,12 @@ def test_adb_output(self): config_classes.FakeSimulatorConfig(screen_dimensions=(320, 480)) ) simulator.launch() - adb_controller = simulator.create_adb_controller() - line = adb_controller.execute_command(['shell', 'dumpsys', 'input']) + adb_controller: fake_simulator.FakeAdbController = ( + simulator.create_adb_controller() + ) + line = adb_controller.execute_command( + ['shell', 'dumpsys', 'input'], timeout=datetime.timedelta(seconds=5) + ) line = line.decode('utf-8') matches = re.match(r'\s+SurfaceOrientation:\s+(\d)', line) self.assertIsNotNone(matches)