diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-16 16:37:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-16 16:37:16 +0000 |
| commit | b101eec5e1fa0a0d1903f5c151afc4d0850c6e7a (patch) | |
| tree | b9a6b60023b853553ae095370bf251a2f1f7640e /catapult/common/py_utils/py_utils/ts_proxy_server.py | |
| parent | c3c0a062c154059518c98495eab1005569def05b (diff) | |
| parent | 4537bffda5f89155f2f27afc7c80e4c0354c1c20 (diff) | |
| download | chromium-trace-b101eec5e1fa0a0d1903f5c151afc4d0850c6e7a.tar.gz | |
Merge changes I195c394b,Iff693cf6
* changes:
Update catapult to latest version(ab9d330fe2)
Update scripts to specify python2
Diffstat (limited to 'catapult/common/py_utils/py_utils/ts_proxy_server.py')
| -rw-r--r-- | catapult/common/py_utils/py_utils/ts_proxy_server.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/catapult/common/py_utils/py_utils/ts_proxy_server.py b/catapult/common/py_utils/py_utils/ts_proxy_server.py index 0e168a53..ffed090f 100644 --- a/catapult/common/py_utils/py_utils/ts_proxy_server.py +++ b/catapult/common/py_utils/py_utils/ts_proxy_server.py @@ -194,6 +194,7 @@ class TsProxyServer(object): if not self._proc: return try: + self._IssueCommand('exit', timeout=10) py_utils.WaitFor(lambda: self._proc.poll() is not None, 10) except py_utils.TimeoutException: # signal.SIGINT is not supported on Windows. |