diff options
| author | cpilch <cpilch@google.com> | 2017-03-23 17:04:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-23 17:04:13 +0000 |
| commit | c85d3991085d2097ea66195bce59551907e5c686 (patch) | |
| tree | b7776771e4fcddc61ec1f82ca67c7e875a71c521 | |
| parent | 6a415990c71f64f612080a4cf6a257d0f3b356f7 (diff) | |
| parent | 5dd9bf7896ac0e29aae3e5e7f896366617f5b68a (diff) | |
| download | adt-infra-c85d3991085d2097ea66195bce59551907e5c686.tar.gz | |
On windows error when trying to kill non-existent am: 3d2b8beb2f
am: 5dd9bf7896
Change-Id: I52908dc655a2ca99b67b0f12c6a745d8361b4fdd
| -rw-r--r-- | emu_test/utils/emu_testcase.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/emu_test/utils/emu_testcase.py b/emu_test/utils/emu_testcase.py index 60e785c2..21d24ee7 100644 --- a/emu_test/utils/emu_testcase.py +++ b/emu_test/utils/emu_testcase.py @@ -172,7 +172,11 @@ class EmuBaseTestCase(LoggedTestCase): self.m_logger.info('No emulator found, stopping logcat') break if (logcat_proc): + try: logcat_proc.terminate() + except: + # Could not terminate logcat; probably already dead. + pass def readoutput_in_thread(): with open(verbose_log_path, 'a') as verb_output: |