diff options
author | John Reck <jreck@google.com> | 2017-01-18 13:57:49 -0800 |
---|---|---|
committer | John Reck <jreck@google.com> | 2017-01-18 13:57:49 -0800 |
commit | 33259e44c8229f70ffe0cf3bb5ca9375c4feb2f9 (patch) | |
tree | e242f8f9f5a34573ed96d2305bf04de98b16e6aa /catapult/devil/PRESUBMIT.py | |
parent | afdddd10010a31b4e9c35b4fb8b84bcddedeed10 (diff) | |
download | chromium-trace-33259e44c8229f70ffe0cf3bb5ca9375c4feb2f9.tar.gz |
Update catapult
Change-Id: I910174f04ddd7be9b607f4a2a60c88e0b8bfcf20
Fixes: 34127555
Fixes: 34225046
Test: Ran systrace, viewed result
Diffstat (limited to 'catapult/devil/PRESUBMIT.py')
-rw-r--r-- | catapult/devil/PRESUBMIT.py | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/catapult/devil/PRESUBMIT.py b/catapult/devil/PRESUBMIT.py index edec3e16..289a5c65 100644 --- a/catapult/devil/PRESUBMIT.py +++ b/catapult/devil/PRESUBMIT.py @@ -26,21 +26,17 @@ def _RunUnitTests(input_api, output_api): 'PYTHONPATH': ':'.join([J(), J('..')]), }) - return input_api.canned_checks.RunUnitTests( - input_api, - output_api, - unit_tests=[ - J('devil_env_test.py'), - J('android', 'battery_utils_test.py'), - J('android', 'device_utils_test.py'), - J('android', 'fastboot_utils_test.py'), - J('android', 'md5sum_test.py'), - J('android', 'logcat_monitor_test.py'), - J('android', 'tools', 'script_common_test.py'), - J('utils', 'cmd_helper_test.py'), - J('utils', 'timeout_retry_unittest.py'), - ], - env=test_env) + message_type = (output_api.PresubmitError if input_api.is_committing + else output_api.PresubmitPromptWarning) + + return input_api.RunTests([ + input_api.Command( + name='devil/bin/run_py_tests', + cmd=[ + input_api.os_path.join( + input_api.PresubmitLocalPath(), 'bin', 'run_py_tests')], + kwargs={'env': test_env}, + message=message_type)]) def _EnsureNoPylibUse(input_api, output_api): |