Bug 1107336: update marionette client runners to use the new marionette driver; r=jgriffin

--HG--
extra : rebase_source : da49059b877a0bf70fcb0868f78c12be2d33c646

testing/marionette/client/marionette/__init__.py

@@ -2,33 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from gestures import smooth_scroll, pinch
-from by import By
-from marionette import Marionette, HTMLElement, Actions, MultiActions
 from marionette_test import MarionetteTestCase, MarionetteJSTestCase, CommonTestCase, expectedFailure, skip, SkipTest
-from errors import (
-    ElementNotVisibleException,
-    ElementNotAccessibleException,
-    ErrorCodes,
-    FrameSendFailureError,
-    FrameSendNotInitializedError,
-    InvalidCookieDomainException,
-    InvalidElementStateException,
-    InvalidResponseException,
-    InvalidSelectorException,
-    JavascriptException,
-    MarionetteException,
-    MoveTargetOutOfBoundsException,
-    NoAlertPresentException,
-    NoSuchElementException,
-    NoSuchFrameException,
-    NoSuchWindowException,
-    ScriptTimeoutException,
-    StaleElementException,
-    TimeoutException,
-    UnableToSetCookieException,
-    XPathLookupException,
-)
 from runner import (
         B2GTestCaseMixin,
         B2GTestResultMixin,
@@ -50,6 +24,3 @@ from runner import (
         TestResult,
         TestResultCollection
 )
-from wait import Wait
-from date_time_value import DateTimeValue
-import decorators

testing/marionette/client/marionette/b2g_update_test.py

@@ -12,8 +12,8 @@ import types
 import weakref
 
 from b2ginstance import B2GInstance
-from errors import InvalidResponseException
-from marionette import Marionette
+from marionette_driver.errors import InvalidResponseException
+from marionette_driver.marionette import Marionette
 from marionette_test import MarionetteTestCase
 from marionette_transport import MarionetteTransport
 from runtests import MarionetteTestRunner, cli

testing/marionette/client/marionette/marionette_test.py

@@ -14,7 +14,8 @@ import unittest
 import weakref
 import warnings
 
-from errors import (
+
+from marionette_driver.errors import (
         ErrorCodes, MarionetteException, InstallGeckoError, TimeoutException, InvalidResponseException,
         JavascriptException, NoSuchElementException, XPathLookupException, NoSuchWindowException,
         StaleElementException, ScriptTimeoutException, ElementNotVisibleException,
@@ -22,10 +23,10 @@ from errors import (
         InvalidCookieDomainException, UnableToSetCookieException, InvalidSelectorException,
         MoveTargetOutOfBoundsException, FrameSendNotInitializedError, FrameSendFailureError
         )
-from marionette import Marionette
+from marionette_driver.marionette import Marionette
 from mozlog.structured.structuredlog import get_default_logger
-from wait import Wait
-from expected import element_present, element_not_present
+from marionette_driver.wait import Wait
+from marionette_driver.expected import element_present, element_not_present
 
 
 class SkipTest(Exception):

testing/marionette/client/marionette/runner/base.py

@@ -17,7 +17,7 @@ import unittest
 import xml.dom.minidom as dom
 
 from manifestparser import TestManifest
-from marionette import Marionette
+from marionette_driver.marionette import Marionette
 from mixins.b2g import B2GTestResultMixin, get_b2g_pid, get_dm
 from mozhttpd import MozHttpd
 from mozlog.structured.structuredlog import get_default_logger

testing/marionette/client/requirements.txt

@@ -1,4 +1,5 @@
 marionette-transport == 0.4
+marionette-driver == 0.1
 manifestparser
 mozhttpd >= 0.5
 mozinfo >= 0.7