Index: tools/android/loading/devtools_monitor.py |
diff --git a/tools/android/loading/devtools_monitor.py b/tools/android/loading/devtools_monitor.py |
index 5279e4f6d327a73e6de03d40d84a48088697f4f1..4c85b7d974e77d32b82f50e9f014819428144b5d 100644 |
--- a/tools/android/loading/devtools_monitor.py |
+++ b/tools/android/loading/devtools_monitor.py |
@@ -20,6 +20,9 @@ from telemetry.internal.backends.chrome_inspector import inspector_websocket |
from telemetry.internal.backends.chrome_inspector import websocket |
+WEBSOCKET_TIMEOUT = 10 # seconds |
Benoit L
2016/02/18 13:01:25
This is not really a websocket timeout. It's rathe
gabadie
2016/02/18 13:21:58
Done.
|
+ |
+ |
class DevToolsConnectionException(Exception): |
def __init__(self, message): |
super(DevToolsConnectionException, self).__init__(message) |
@@ -189,20 +192,21 @@ class DevToolsConnection(object): |
self._tearing_down_tracing = False |
self._set_up = True |
- def StartMonitoring(self): |
+ def StartMonitoring(self, timeout=WEBSOCKET_TIMEOUT): |
"""Starts monitoring. |
DevToolsConnection.SetUpMonitoring() has to be called first. |
""" |
assert self._set_up, 'DevToolsConnection.SetUpMonitoring not called.' |
- self._Dispatch() |
+ self._Dispatch(timeout=timeout) |
self._TearDownMonitoring() |
def StopMonitoring(self): |
"""Stops the monitoring.""" |
self._please_stop = True |
- def _Dispatch(self, kind='Monitoring', timeout=10): |
+ def _Dispatch(self, kind='Monitoring', |
+ timeout=WEBSOCKET_TIMEOUT): |
self._please_stop = False |
while not self._please_stop: |
try: |