commit fa8f5ed98a2c05babc3962b956cca5db2b114a09
author Jingjing Liu <jingjingliu@google.com> Thu Mar 23 20:33:19 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 23 20:33:19 2017 +0000
tree 791a0503a9cff61ba3e8cecd17299dbf5edce438
parent 3d2b8beb2f141260d5b0448393fdd8e5f23faf29
parent d06abd405ff6356101af23ba7e719a7970cb4d88

Merge "Stabilize test: test_auth_empty_auth_token_file"

emu_test/utils/emu_testcase.py

diff --git a/emu_test/utils/emu_testcase.py b/emu_test/utils/emu_testcase.py
index 60e785c..21d24ee 100644
--- a/emu_test/utils/emu_testcase.py
+++ b/emu_test/utils/emu_testcase.py
@@ -172,7 +172,11 @@
                         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: