Commit 6abe50b2 authored by Chong Gu's avatar Chong Gu Committed by Commit Bot

[Fuchsia] Fix wrong format of device-finder timeout.

Create _DEVICE_FINDER_TIMEOUT_LIMIT variable.

Bug: 1080853
Change-Id: I21fb1ec1dcd462b005f76cd9287b7b400a0c83ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489323Reviewed-by: default avatarKevin Marshall <kmarshall@chromium.org>
Commit-Queue: Chong Gu <chonggu@google.com>
Auto-Submit: Chong Gu <chonggu@google.com>
Cr-Commit-Position: refs/heads/master@{#820156}
parent 07722172
...@@ -31,6 +31,10 @@ CONNECT_RETRY_COUNT_BEFORE_LOGGING = 10 ...@@ -31,6 +31,10 @@ CONNECT_RETRY_COUNT_BEFORE_LOGGING = 10
# Number of seconds to wait for device discovery. # Number of seconds to wait for device discovery.
BOOT_DISCOVERY_TIMEOUT_SECS = 2 * 60 BOOT_DISCOVERY_TIMEOUT_SECS = 2 * 60
# The timeout limit for one call to the device-finder tool.
_DEVICE_FINDER_TIMEOUT_LIMIT_SECS = \
BOOT_DISCOVERY_TIMEOUT_SECS / BOOT_DISCOVERY_ATTEMPTS
# Time between a reboot command is issued and when connection attempts from the # Time between a reboot command is issued and when connection attempts from the
# host begin. # host begin.
_REBOOT_SLEEP_PERIOD = 20 _REBOOT_SLEEP_PERIOD = 20
...@@ -170,7 +174,7 @@ class DeviceTarget(target.Target): ...@@ -170,7 +174,7 @@ class DeviceTarget(target.Target):
dev_finder_path, dev_finder_path,
'resolve', 'resolve',
'-timeout', '-timeout',
"%ds" % BOOT_DISCOVERY_TIMEOUT_SECS / BOOT_DISCOVERY_ATTEMPTS, "%ds" % _DEVICE_FINDER_TIMEOUT_LIMIT_SECS,
'-device-limit', '-device-limit',
'1', # Exit early as soon as a host is found. '1', # Exit early as soon as a host is found.
self._node_name self._node_name
...@@ -178,7 +182,7 @@ class DeviceTarget(target.Target): ...@@ -178,7 +182,7 @@ class DeviceTarget(target.Target):
else: else:
command = [ command = [
dev_finder_path, 'list', '-full', '-timeout', dev_finder_path, 'list', '-full', '-timeout',
"%ds" % BOOT_DISCOVERY_TIMEOUT_SECS / BOOT_DISCOVERY_ATTEMPTS "%ds" % _DEVICE_FINDER_TIMEOUT_LIMIT_SECS
] ]
proc = subprocess.Popen(command, proc = subprocess.Popen(command,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment