diff options
| author | cpilch <cpilch@google.com> | 2017-03-22 18:43:52 -0700 |
|---|---|---|
| committer | cpilch <cpilch@google.com> | 2017-03-22 18:43:52 -0700 |
| commit | 3d2b8beb2f141260d5b0448393fdd8e5f23faf29 (patch) | |
| tree | b7776771e4fcddc61ec1f82ca67c7e875a71c521 | |
| parent | beac150a420955a3f4feda689c1dbe95ac013ee5 (diff) | |
| download | adt-infra-3d2b8beb2f141260d5b0448393fdd8e5f23faf29.tar.gz | |
On windows error when trying to kill non-existent
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: I098b8c6c284e84b0a400a4fd0b87838afd3b053c
| -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: |