Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4574)

Unified Diff: telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py

Issue 2782683003: Increase the websocket timeout in Chrome OS. (Closed)
Patch Set: Set the timeout in ad-hoc manner. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
diff --git a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
index 3eb0e9dbbdfab3eb1961902e27016ec7f44cff48..80d2cf3a10add6095f794e6ad24ce06a4590c2ee 100644
--- a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
+++ b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
@@ -8,6 +8,7 @@ import shlex
import sys
from telemetry.core import exceptions
+from telemetry.core import util
from telemetry import decorators
from telemetry.internal.backends import browser_backend
from telemetry.internal.backends.chrome import extension_backend
@@ -269,6 +270,10 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
if self._system_info_backend is None:
self._system_info_backend = system_info_backend.SystemInfoBackend(
self._port)
+ # TODO(crbug.com/706336): Remove this condional branch once crbug.com/704024
+ # is fixed.
+ if util.IsRunningOnCrosDevice():
+ return self._system_info_backend.GetSystemInfo(timeout=30)
return self._system_info_backend.GetSystemInfo()
@property
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698