diff options
| author | Armand Navabi <navabi@google.com> | 2017-03-22 14:47:01 -0700 |
|---|---|---|
| committer | Armand Navabi <navabi@google.com> | 2017-03-22 14:47:01 -0700 |
| commit | 00db880868e394c48975bf25d9c3fb1b3cab2ff7 (patch) | |
| tree | 451347060227880c61b9641bb10e34b61d85c64f | |
| parent | 9e55ea725037eb453152ea366198fed070b31e76 (diff) | |
| download | adt-infra-00db880868e394c48975bf25d9c3fb1b3cab2ff7.tar.gz | |
On windows error when trying to kill non-existent logcat proc.
See: http://xinchan-lab2.mtv.corp.google.com:8700/builders/Win%2010%2064-bit%20Quadro%20600%201_UI/builds/598
Test: Need to fix expectations for this recipe code as it has
gotten way out of date
Change-Id: I35ca6ee024a4bb5633f16fdeab6e13276dc067f1
| -rw-r--r-- | emu_test/utils/emu_testcase.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/emu_test/utils/emu_testcase.py b/emu_test/utils/emu_testcase.py index 60e785c2..ea3e24e7 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): - logcat_proc.terminate() + 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: |