Bug 1312739 - Fix marionette SEARCH_PATHS in mach_test_package_bootstrap.py, r?jmaher draft
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Tue, 20 Dec 2016 14:08:21 -0500
changeset 454671 1858a65c567f20be728ab93e2835637844d1dee1
parent 454641 79ef936724454728beeeba41fb76a61d02c7c226
child 454672 fa88870077bc85d7e1047e2dc120eed2dcb932dd
push id39997
push userahalberstadt@mozilla.com
push dateThu, 29 Dec 2016 22:27:12 +0000
reviewersjmaher
bugs1312739, 1320073
milestone53.0a1
Bug 1312739 - Fix marionette SEARCH_PATHS in mach_test_package_bootstrap.py, r?jmaher In bug 1320073, the marionette package structure was refactored a bit. This made the SEARCH_PATHS in the mach test package bootstrap outdated. While this didn't end up causing any errors due to marionette also appearing in an activated virtualenv, it should still be fixed. Figured since I was in the area, I would just piggy-back off this commit series rather than filing a new bug. MozReview-Commit-ID: DCNz3xEVJfY
testing/tools/mach_test_package_bootstrap.py
--- a/testing/tools/mach_test_package_bootstrap.py
+++ b/testing/tools/mach_test_package_bootstrap.py
@@ -7,18 +7,18 @@ from __future__ import print_function, u
 import json
 import os
 import platform
 import sys
 import types
 
 
 SEARCH_PATHS = [
-    'marionette',
-    'marionette/marionette/runner/mixins/browsermob-proxy-py',
+    'marionette/harness',
+    'marionette/harness/marionette_harness/runner/mixins/browsermob-proxy-py',
     'marionette/client',
     'mochitest',
     'mozbase/manifestparser',
     'mozbase/mozcrash',
     'mozbase/mozdebug',
     'mozbase/mozdevice',
     'mozbase/mozfile',
     'mozbase/mozhttpd',