Bug 1312739 - Fix marionette SEARCH_PATHS in mach_test_package_bootstrap.py, r=jmaher
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Tue, 20 Dec 2016 14:08:21 -0500
changeset 327806 50dc2c5fe0f1a7bc525c8bef482d366524ebb6be
parent 327805 b109ff48d635fe65e90e7f590a5882e96a6056d5
child 327807 7dbc513c553f5c8a3d59284ed97272728e04965c
push id31154
push userphilringnalda@gmail.com
push dateWed, 04 Jan 2017 02:32:47 +0000
treeherdermozilla-central@9c825a25d288 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1312739, 1320073
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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',