diff options
author | jbudorick <jbudorick@chromium.org> | 2015-04-21 07:02:52 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-21 14:04:02 +0000 |
commit | cdb5bb0b94d7d2716a0c826fca576a0efdd33511 (patch) | |
tree | 599d7a86fab17e70cd17c1221b3b509e90690521 /build/android/pylib/monkey/test_runner.py | |
parent | f0a9e71e6ad0b13397d45afeeeba7c0ced15b570 (diff) | |
download | chromium_src-cdb5bb0b94d7d2716a0c826fca576a0efdd33511.zip chromium_src-cdb5bb0b94d7d2716a0c826fca576a0efdd33511.tar.gz chromium_src-cdb5bb0b94d7d2716a0c826fca576a0efdd33511.tar.bz2 |
[Android] More old_interface conversions in build/android/.
This also creates build/android/pylib/constants/ and moves the existing
constants.py file into it as __init__.py.
BUG=267773
Review URL: https://codereview.chromium.org/1092703002
Cr-Commit-Position: refs/heads/master@{#326025}
Diffstat (limited to 'build/android/pylib/monkey/test_runner.py')
-rw-r--r-- | build/android/pylib/monkey/test_runner.py | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/build/android/pylib/monkey/test_runner.py b/build/android/pylib/monkey/test_runner.py index 19dd339..3fd1797 100644 --- a/build/android/pylib/monkey/test_runner.py +++ b/build/android/pylib/monkey/test_runner.py @@ -10,8 +10,11 @@ import random from pylib import constants from pylib.base import base_test_result from pylib.base import base_test_runner +from pylib.device import device_errors from pylib.device import intent +_CHROME_PACKAGE = constants.PACKAGE_INFO['chrome'].package + class TestRunner(base_test_runner.BaseTestRunner): """A TestRunner instance runs a monkey test on a single device.""" @@ -87,9 +90,17 @@ class TestRunner(base_test_runner.BaseTestRunner): test_name, base_test_result.ResultType.FAIL, log=output) if 'chrome' in self._options.package: logging.warning('Starting MinidumpUploadService...') + # TODO(jbudorick): Update this after upstreaming. + minidump_intent = intent.Intent( + action='%s.crash.ACTION_FIND_ALL' % _CHROME_PACKAGE, + package=self._package, + activity='%s.crash.MinidumpUploadService' % _CHROME_PACKAGE) try: - self.device.old_interface.StartCrashUploadService(self._package) - except AssertionError as e: - logging.error('Failed to start MinidumpUploadService: %s', e) + self.device.RunShellCommand( + ['am', 'startservice'] + minidump_intent.am_args, + as_root=True, check_return=True) + except device_errors.CommandFailedError: + logging.exception('Failed to start MinidumpUploadService') + results.AddResult(result) return results, False |