Index: tools/android/loading/devtools_monitor.py |
diff --git a/tools/android/loading/devtools_monitor.py b/tools/android/loading/devtools_monitor.py |
index 68c785f15a50a6e73636a5404e741bfff5b0b1cd..3ea8eeac652061f5d960955225538c599d063c75 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 |
+DEFAULT_TIMEOUT = 10 # seconds |
Benoit L
2016/02/22 14:11:26
I usually prefer to have the unit in the name, suc
|
+ |
+ |
class DevToolsConnectionException(Exception): |
def __init__(self, message): |
super(DevToolsConnectionException, self).__init__(message) |
@@ -217,20 +220,21 @@ class DevToolsConnection(object): |
self._tearing_down_tracing = False |
self._set_up = True |
- def StartMonitoring(self): |
+ def StartMonitoring(self, timeout=DEFAULT_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=DEFAULT_TIMEOUT): |
self._please_stop = False |
while not self._please_stop: |
try: |