diff options
author | Hridya Valsaraju <hridya@google.com> | 2021-04-15 15:57:00 -0700 |
---|---|---|
committer | Hridya Valsaraju <hridya@google.com> | 2021-04-15 15:57:00 -0700 |
commit | 4537bffda5f89155f2f27afc7c80e4c0354c1c20 (patch) | |
tree | b9a6b60023b853553ae095370bf251a2f1f7640e /catapult/devil/bin | |
parent | 25821f7b195e31b5b957ddc720a6bc12700362a0 (diff) | |
download | chromium-trace-4537bffda5f89155f2f27afc7c80e4c0354c1c20.tar.gz |
Update catapult to latest version(ab9d330fe2)
git log --oneline --no-merges 91735e2e6..ab9d330fe2a3 tracing systrace
ab9d330fe systrace: check if tracefs in mounted in /sys/kernel/tracing
361ae742a systrace: fix tracefs device path detection
22a35ea6a [tracing] Avoid very large vulcanized strings in histogram_viewer.html
494a8eb59 [tracing] Add blink-resource metric
a297a0839 Reland "Remove memoryAblationMetric"
b0fb5822d Used undefined bins as bins of count zero
d229e77e8 Check the bins to be defined before using them in UMA metrics calculations
de74236cf PCScan: Add :clear and :overall metrics for mutator
e46359da4 Move metadata in OWNERS files to DIR_METADATA files
999f35f30 Revert "Remove memoryAblationMetric"
7caeed04d Remove memoryAblationMetric
b965b659c Added metrics for percentage of inTime/delayed/dropped frames
e5299ca5b Fix crash while processing memory dumps
4f4de5e16 PCScan: Update metric to reflect scope contexts
2528f75cb Fix drill down in heap dump pane
1f5037810 trace-viewer: Don't let optional features block import
d2aa56920 Reland "Enable the new GC metrics""
e6e7c9314 Revert "Enable the new GC metrics"
9e0992ffc Enable the new GC metrics
79a90eb5e Include missing header
138dc4ba2 Calculate Overall CLS including all renderer processes.
c8f9f36bb Add a generic count/sum metric.
73a0597ed Add overallCumulativeLayoutShift metric that includes weighted scores for iframes.
Test: systrace
Bug: 185400108
Change-Id: I195c394b78094c4385b308ab6abf1cf57009569b
Diffstat (limited to 'catapult/devil/bin')
-rwxr-xr-x | catapult/devil/bin/generate_md_docs | 2 | ||||
-rwxr-xr-x | catapult/devil/bin/run_py3_tests | 113 |
2 files changed, 114 insertions, 1 deletions
diff --git a/catapult/devil/bin/generate_md_docs b/catapult/devil/bin/generate_md_docs index d1dbf06f..4c6f0f91 100755 --- a/catapult/devil/bin/generate_md_docs +++ b/catapult/devil/bin/generate_md_docs @@ -8,7 +8,7 @@ import os import sys _DEVIL_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) -_DEVIL_URL = ('https://github.com/catapult-project/catapult/blob/master/devil/') +_DEVIL_URL = ('https://chromium.googlesource.com/catapult.git/+/HEAD/devil/') sys.path.append(_DEVIL_PATH) from devil.utils import cmd_helper diff --git a/catapult/devil/bin/run_py3_tests b/catapult/devil/bin/run_py3_tests new file mode 100755 index 00000000..3250ff15 --- /dev/null +++ b/catapult/devil/bin/run_py3_tests @@ -0,0 +1,113 @@ +#!/usr/bin/env vpython3 +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +"""Runs all python3-compatible tests in devil.""" + +import os +import sys +import unittest + +_DEVIL_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) +_SIX_PATH = os.path.join(_DEVIL_PATH, '..', 'third_party', 'six') + +sys.path.append(_DEVIL_PATH) +sys.path.append(_SIX_PATH) +# Import compatible tests here by full module path +import devil.android.apk_helper_test +import devil.android.app_ui_test +import devil.android.battery_utils_test +import devil.android.cpu_temperature_test +import devil.android.decorators_test +import devil.android.device_denylist_test +import devil.android.device_errors_test +import devil.android.device_utils_test +import devil.android.fastboot_utils_test +import devil.android.flag_changer_test +import devil.android.logcat_monitor_test +import devil.android.md5sum_test +import devil.android.perf.perf_control_test +import devil.android.perf.surface_stats_collector_test +import devil.android.sdk.adb_wrapper_test +import devil.android.sdk.shared_prefs_test +import devil.android.tools.device_monitor_test +import devil.android.tools.script_common_test +import devil.android.tools.system_app_test +import devil.devil_env_test +import devil.utils.cmd_helper_test +import devil.utils.decorators_test +import devil.utils.find_usb_devices_test +import devil.utils.geometry_test +import devil.utils.lazy.weak_constant_test +import devil.utils.lsusb_test +import devil.utils.markdown_test +import devil.utils.mock_calls_test +import devil.utils.parallelizer_test +import devil.utils.reraiser_thread_unittest +import devil.utils.timeout_retry_unittest +import devil.utils.zip_utils_test + +PY3_COMPATIBLE_TESTS = [ + # Add full test module path here + devil.android.apk_helper_test, + devil.android.app_ui_test, + devil.android.battery_utils_test, + devil.android.cpu_temperature_test, + devil.android.decorators_test, + devil.android.device_denylist_test, + devil.android.device_errors_test, + devil.android.device_utils_test, + devil.android.fastboot_utils_test, + devil.android.flag_changer_test, + devil.android.logcat_monitor_test, + devil.android.md5sum_test, + devil.android.perf.perf_control_test, + devil.android.perf.surface_stats_collector_test, + devil.android.sdk.adb_wrapper_test, + devil.android.sdk.shared_prefs_test, + devil.android.tools.device_monitor_test, + devil.android.tools.script_common_test, + devil.android.tools.system_app_test, + devil.devil_env_test, + devil.utils.cmd_helper_test, + devil.utils.decorators_test, + devil.utils.find_usb_devices_test, + devil.utils.geometry_test, + devil.utils.lazy.weak_constant_test, + devil.utils.lsusb_test, + devil.utils.markdown_test, + devil.utils.mock_calls_test, + devil.utils.parallelizer_test, + devil.utils.reraiser_thread_unittest, + devil.utils.timeout_retry_unittest, + devil.utils.zip_utils_test, +] + + +def main(): + # TODO(crbug.com/1007101): Use six.PY2 directly once we're using six via + # vpython. + if sys.version_info[0] == 2: + print('Somehow running under python2.') + return 1 + + # Tests mock out internal details of methods, and the ANDROID_SERIAL can + # change which internal methods are called. Since tests don't actually use + # devices, it should be fine to delete the variable. + if 'ANDROID_SERIAL' in os.environ: + del os.environ['ANDROID_SERIAL'] + + # This does not use typ for now, as typ has vpython dependencies that haven't + # yet been updated for python3. + result = unittest.TextTestRunner().run(unittest.TestSuite( + unittest.defaultTestLoader.loadTestsFromModule(test_module) + for test_module in PY3_COMPATIBLE_TESTS + )) + + return 0 if result.wasSuccessful() else 1 + + + +if __name__ == '__main__': + sys.exit(main()) |