diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-04-15 22:47:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-15 22:47:45 +0000 |
| commit | d193e1e18940fc358834a5a3d98fa5974d4e96c4 (patch) | |
| tree | e05070acd257465a86ac97248d8500f691f210f6 /scripts/update_device.py | |
| parent | c1bdf7d116d033a8927cbcfebda89bf74baf3839 (diff) | |
| parent | 25b6a448a3dfe8ea9502da885e85537335e0c309 (diff) | |
Add 5s timeout to cleanup commands am: 3a18895c6f am: 9816401d02 am: 25b6a448a3
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1674626
Change-Id: Ie259375b4890fc658ad95b9f4f42fa58c20369a8
Diffstat (limited to 'scripts/update_device.py')
| -rwxr-xr-x | scripts/update_device.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/update_device.py b/scripts/update_device.py index b784b1bc..3ce40a55 100755 --- a/scripts/update_device.py +++ b/scripts/update_device.py @@ -350,7 +350,7 @@ class AdbHost(object): if self._device_serial: self._command_prefix += ['-s', self._device_serial] - def adb(self, command): + def adb(self, command, timeout_seconds: float = None): """Run an ADB command like "adb push". Args: @@ -365,7 +365,7 @@ class AdbHost(object): command = self._command_prefix + command logging.info('Running: %s', ' '.join(str(x) for x in command)) p = subprocess.Popen(command, universal_newlines=True) - p.wait() + p.wait(timeout_seconds) return p.returncode def adb_output(self, command): @@ -546,7 +546,7 @@ def main(): if server_thread: server_thread.StopServer() for cmd in finalize_cmds: - dut.adb(cmd) + dut.adb(cmd, 5) return 0 |