diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-16 18:15:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-16 18:15:09 +0000 |
| commit | 404449cf55ec6de2f989864cf8ea2b315d651438 (patch) | |
| tree | b9a6b60023b853553ae095370bf251a2f1f7640e /catapult/common/py_utils/py_utils/ts_proxy_server.py | |
| parent | 977f880b2fd00c647f646cd7d89cc99fc40785b0 (diff) | |
| parent | ef2f29d2b3cf25a46be203d6b12ad0eceaf270b2 (diff) | |
| download | chromium-trace-404449cf55ec6de2f989864cf8ea2b315d651438.tar.gz | |
Merge changes I195c394b,Iff693cf6 am: b101eec5e1 am: d5085cc096 am: 19f3aab438 am: ef2f29d2b3
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1677030
Change-Id: I0db46c49b8612a35c20dda4fda86e5070c194102
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. |