| commit | 3b0c4b7ccab92c0309798098f331734f023bc577 | [log] [tgz] |
|---|---|---|
| author | Noah Rose Ledesma <[email protected]> | Mon Aug 05 22:57:25 2024 |
| committer | Chromium LUCI CQ <[email protected]> | Mon Aug 05 22:57:25 2024 |
| tree | 8906b1b6ed6df72878ec09ae621c45577203189c | |
| parent | 3e642b84a61bfc028e8e27694bcf776c641356bd [diff] [blame] |
Revert "Fix //testing import lint issues" This reverts commit a418670f47e2a8bb3a2ce69e990203eb69b5225f. Reason for revert: Causing ModuleNotFoundError: No module named 'skia_gold_common' errors on gardened builders Original change's description: > Fix //testing import lint issues > > Removes the import-related entries from //testing's pylintrc file and > fixes resulting lint errors. > > Bug: 353942917 > Change-Id: Ie3b3dba795e0806631c37243a3b4f480a4215a6e > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5737567 > Auto-Submit: Brian Sheedy <[email protected]> > Commit-Queue: Brian Sheedy <[email protected]> > Reviewed-by: Ben Pastene <[email protected]> > Cr-Commit-Position: refs/heads/main@{#1337485} Bug: 353942917 Change-Id: Ic27cddfc5fda700b5898c3681af18f42fd1222fa No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5763726 Commit-Queue: Noah Rose Ledesma <[email protected]> Bot-Commit: Rubber Stamper <[email protected]> Owners-Override: Noah Rose Ledesma <[email protected]> Reviewed-by: Brian Sheedy <[email protected]> Cr-Commit-Position: refs/heads/main@{#1337552}
diff --git a/testing/merge_scripts/standard_gtest_merge_test.py b/testing/merge_scripts/standard_gtest_merge_test.py index 05ea01f..e39fe9c9 100755 --- a/testing/merge_scripts/standard_gtest_merge_test.py +++ b/testing/merge_scripts/standard_gtest_merge_test.py
@@ -7,14 +7,21 @@ import logging import os import shutil +import six import sys import tempfile import unittest -from unittest import mock - -import six import common_merge_script_tests +import six + +THIS_DIR = os.path.dirname(os.path.abspath(__file__)) + +# For 'standard_gtest_merge.py'. +sys.path.insert(0, os.path.abspath(os.path.join(THIS_DIR, '..', 'resources'))) + +import mock + import standard_gtest_merge # gtest json output for successfully finished shard #0.