commit 03db63a826b3092f96ebd54184d78527cc9e64e1
author Jack Franklin <jacktfranklin@chromium.org> Thu Sep 16 14:40:56 2021 +0100
committer Devtools-frontend LUCI CQ <devtools-frontend-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 16 14:12:05 2021 +0000
tree e8429ce4681ce5587827e8cc0a35756cea408328
parent 484b6c89ac6f6b9440c9e009daf030bdd33526a0

Use mocha_path() from devtools_paths in PRESUBMIT

Cleaner and uses a path that is happy on Windows.

Bug: none
Change-Id: Ia1f7952adb7b8a6591a8abc145ad321463f1e6e3
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3165096
Auto-Submit: Jack Franklin <jacktfranklin@chromium.org>
Reviewed-by: Philip Pfaffe <pfaffe@chromium.org>
Commit-Queue: Jack Franklin <jacktfranklin@chromium.org>
Commit-Queue: Philip Pfaffe <pfaffe@chromium.org>

PRESUBMIT.py

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 2be65f7..4274694 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -206,6 +206,14 @@
     # tests if so.
     # We don't do this on every CL as most do not touch the rules, but if we do
     # change them we need to make sure all the tests are passing.
+    original_sys_path = sys.path
+    try:
+        sys.path = sys.path + [
+            input_api.os_path.join(input_api.PresubmitLocalPath(), 'scripts')
+        ]
+        import devtools_paths
+    finally:
+        sys.path = original_sys_path
     eslint_rules_dir_path = input_api.os_path.join(
         input_api.PresubmitLocalPath(), 'scripts', 'eslint_rules')
     eslint_rules_affected_files = _getAffectedFiles(input_api,
@@ -215,8 +223,7 @@
     if (len(eslint_rules_affected_files) == 0):
         return []
 
-    mocha_path = input_api.os_path.join(input_api.PresubmitLocalPath(),
-                                        'node_modules', '.bin', 'mocha')
+    mocha_path = devtools_paths.mocha_path()
     eslint_tests_path = input_api.os_path.join(eslint_rules_dir_path, 'tests',
                                                '*_test.js')