Backed out changeset f3cf063a5608 (bug 1283216) on request from whimboo
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 15 Feb 2017 11:07:16 +0100
changeset 389474 0a7831d838f793a263456df62f95a615472a7f95
parent 389473 1060668405a9399774c205430de4a7001d3f27ac
child 389523 5e691d87bed93f740094604be686567b34a6f29d
push id7198
push userjlorenzo@mozilla.com
push dateTue, 18 Apr 2017 12:07:49 +0000
treeherdermozilla-beta@d57aa49c3948 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1283216
milestone54.0a1
backs outf3cf063a5608a011ee6ec72cf33378616d0da15f
first release with
nightly linux32
0a7831d838f7 / 54.0a1 / 20170215110151 / files
nightly linux64
0a7831d838f7 / 54.0a1 / 20170215110151 / files
nightly mac
0a7831d838f7 / 54.0a1 / 20170215030342 / files
nightly win32
0a7831d838f7 / 54.0a1 / 20170215030342 / files
nightly win64
0a7831d838f7 / 54.0a1 / 20170215030342 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset f3cf063a5608 (bug 1283216) on request from whimboo
testing/marionette/client/marionette_driver/marionette.py
--- a/testing/marionette/client/marionette_driver/marionette.py
+++ b/testing/marionette/client/marionette_driver/marionette.py
@@ -17,24 +17,16 @@ from contextlib import contextmanager
 import errors
 import transport
 
 from .decorators import do_process_check
 from .geckoinstance import GeckoInstance
 from .keys import Keys
 from .timeout import Timeouts
 
-try:
-    from mozbuild.base import (
-        MozbuildObject
-    )
-    build = MozbuildObject.from_environment()
-except ImportError:
-    build = None
-
 WEBELEMENT_KEY = "ELEMENT"
 W3C_WEBELEMENT_KEY = "element-6066-11e4-a52e-4f735466cecf"
 
 
 class HTMLElement(object):
     """Represents a DOM Element."""
 
     def __init__(self, marionette, id):
@@ -583,20 +575,17 @@ class Marionette(object):
             `app`.
         :param app: Type of ``instance_class`` to use for managing app
             instance. See ``marionette_driver.geckoinstance``.
         :param instance_args: Arguments to pass to ``instance_class``.
 
         """
         self.host = host
         self.port = self.local_port = int(port)
-        if bin is None and build is not None:
-            self.bin = build.get_binary_path()
-        else:
-            self.bin = bin
+        self.bin = bin
         self.client = None
         self.instance = None
         self.session = None
         self.session_id = None
         self.process_id = None
         self.profile = None
         self.window = None
         self.chrome_window = None