Skip to content

Widen OxygenAdbController signature to accept datetime.timedelta timeouts. #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Widen OxygenAdbController signature to accept datetime.timedelta timeouts. #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion android_env/components/simulators/fake/fake_simulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

"""Fake Simulator for testing AndroidEnv infrastructure."""

import datetime
import random
import threading
import time
Expand Down Expand Up @@ -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."""
Expand Down
9 changes: 7 additions & 2 deletions android_env/components/simulators/fake/fake_simulator_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

"""Tests for fake_simulator."""

import datetime
import re
from absl.testing import absltest
from android_env.components import config_classes
Expand Down Expand Up @@ -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)
Expand Down
Loading