Chromium Code Reviews| Index: build/android/pylib/monkey/test_runner.py |
| diff --git a/build/android/pylib/monkey/test_runner.py b/build/android/pylib/monkey/test_runner.py |
| index 42b7d41f116df21b353e416cf80fdfcbd7d5f04f..2c5cccc15a302a81965fe77c8aeade2c087952ef 100644 |
| --- a/build/android/pylib/monkey/test_runner.py |
| +++ b/build/android/pylib/monkey/test_runner.py |
| @@ -58,22 +58,22 @@ class TestRunner(base_test_runner.BaseTestRunner): |
| # Chrome crashes are not always caught by Monkey test runner. |
| # Verify Chrome has the same PID before and after the test. |
| - before_pids = self.device.old_interface.ExtractPid(self._package) |
| + before_pids = self.device.GetPids(self._package) |
| # Run the test. |
| output = '' |
| if before_pids: |
| output = '\n'.join(self._LaunchMonkeyTest()) |
| - after_pids = self.device.old_interface.ExtractPid(self._package) |
| + after_pids = self.device.GetPids(self._package) |
| crashed = True |
| - if not before_pids: |
| + if not before_pids or not self._package in before_pids: |
|
frankf
2014/07/15 17:27:05
can't you shorten ths to:
if self_package not in b
jbudorick
2014/07/16 01:08:52
Done.
|
| logging.error('Failed to start the process.') |
| - elif not after_pids: |
| - logging.error('Process %s has died.', before_pids[0]) |
| - elif before_pids[0] != after_pids[0]: |
| + elif not after_pids or not self._package in after_pids: |
| + logging.error('Process %s has died.', before_pids[self._package]) |
| + elif before_pids[self._package] != after_pids[self._package]: |
| logging.error('Detected process restart %s -> %s', |
| - before_pids[0], after_pids[0]) |
| + before_pids[self._package], after_pids[self._package]) |
| else: |
| crashed = False |