Bug 1109183 - Fix imports of the marionette client and remove spurious entry from sys.path provided by mach. r=ahal

--HG--
extra : rebase_source : 1c6579dfd5cd44973a74b5c0f81b14fca6f170d4

browser/components/loop/test/functional/test_1_browser_call.py

@@ -1,14 +1,15 @@
-from marionette_test import MarionetteTestCase
 try:
     from by import By
     from errors import NoSuchElementException, StaleElementException
     # noinspection PyUnresolvedReferences
     from wait import Wait
+    from marionette_test import MarionetteTestCase
 except ImportError:
     from marionette_driver.by import By
     from marionette_driver.errors import NoSuchElementException, StaleElementException
     # noinspection PyUnresolvedReferences
     from marionette_driver import Wait
+    from marionette import MarionetteTestCase
 
 import os
 import sys

browser/components/loop/test/shared/frontend_tester.py

@@ -1,4 +1,4 @@
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import NoSuchElementException
 import threading
 import SimpleHTTPServer

build/mach_bootstrap.py

@@ -49,7 +49,6 @@ SEARCH_PATHS = [
     'testing/web-platform',
     'testing/web-platform/harness',
     'testing/marionette/client',
-    'testing/marionette/client/marionette',
     'testing/marionette/transport',
     'testing/marionette/driver',
     'testing/mozbase/mozcrash',

layout/base/tests/marionette/test_selectioncarets.py

@@ -5,7 +5,7 @@
 
 from marionette_driver.by import By
 from marionette_driver.marionette import Actions
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.selection import SelectionManager
 from marionette_driver.gestures import long_press_without_contextmenu
 

layout/base/tests/marionette/test_selectioncarets_multiplerange.py

@@ -5,7 +5,7 @@
 
 from marionette_driver.by import By
 from marionette_driver.marionette import Actions
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.selection import SelectionManager
 from marionette_driver.gestures import long_press_without_contextmenu
 

layout/base/tests/marionette/test_touchcaret.py

@@ -6,7 +6,7 @@
 from marionette_driver.by import By
 from marionette_driver.marionette import Actions
 from marionette_driver.selection import SelectionManager
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class TouchCaretTest(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_accessibility.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import (ElementNotAccessibleException,
                                      ElementNotVisibleException)
 

testing/marionette/client/marionette/tests/unit/test_anonymous_content.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 from marionette_driver.errors import NoSuchElementException
 from marionette_driver.expected import element_present

testing/marionette/client/marionette/tests/unit/test_appcache.py

@@ -14,7 +14,7 @@
 #limitations under the License.
 
 from marionette_driver.application_cache import ApplicationCache
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class AppCacheTests(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_capabilities.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import SessionNotCreatedException
 
 class TestCapabilities(MarionetteTestCase):
@@ -80,4 +80,4 @@ class TestCapabilities(MarionetteTestCase):
 
         # Start a new session just to make sure we leave the browser in the
         # same state it was before it started the test
-        self.marionette.start_session()
+        self.marionette.start_session()

testing/marionette/client/marionette/tests/unit/test_clearing.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import InvalidElementStateException
 
 class TestClear(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_click.py

@@ -4,7 +4,7 @@
 
 from marionette_driver.by import By
 from marionette_driver.errors import NoSuchElementException, ElementNotVisibleException
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.marionette import Actions
 from marionette_driver.keys import Keys
 from marionette_driver.wait import Wait

testing/marionette/client/marionette/tests/unit/test_click_chrome.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.by import By
 
 

testing/marionette/client/marionette/tests/unit/test_click_scrolling.py

@@ -4,7 +4,7 @@
 
 from marionette_driver.by import By
 from marionette_driver.errors import MoveTargetOutOfBoundsException
-from marionette_test import MarionetteTestCase, skip
+from marionette import MarionetteTestCase, skip
 
 
 class TestClickScrolling(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_cookies.py

@@ -1,7 +1,7 @@
 import calendar
 import time
 import random
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class CookieTest(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_data_driven.py

@@ -1,5 +1,13 @@
-from marionette_test import parameterized, with_parameters, MetaParameterized, \
-                            MarionetteTestCase
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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 marionette.marionette_test import (
+    parameterized,
+    with_parameters,
+    MetaParameterized,
+    MarionetteTestCase
+)
 
 class Parameterizable(object):
     __metaclass__ = MetaParameterized

testing/marionette/client/marionette/tests/unit/test_date_time_value.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from datetime import datetime
 from marionette_driver.date_time_value import DateTimeValue
 

testing/marionette/client/marionette/tests/unit/test_elementState.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class TestState(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_elementState_chrome.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class TestStateChrome(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_element_touch.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import MarionetteException
 
 class testElementTouch(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_elementsize.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 class TestElementSize(MarionetteTestCase):
     def testShouldReturnTheSizeOfALink(self):

testing/marionette/client/marionette/tests/unit/test_emulator.py

@@ -2,9 +2,8 @@
 # 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 marionette_test import MarionetteTestCase
-from marionette_driver.errors import (JavascriptException,
-                                      MarionetteException)
+from marionette import MarionetteTestCase
+from marionette_driver.errors import MarionetteException
 
 
 class TestEmulatorContent(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_errors.py

@@ -4,7 +4,7 @@
 
 import sys
 
-import marionette_test
+from marionette import marionette_test
 from marionette_driver import errors
 from marionette_driver.errors import ErrorCodes
 

testing/marionette/client/marionette/tests/unit/test_execute_async_script.py

@@ -2,11 +2,10 @@
 # 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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import ( JavascriptException,
                                        MarionetteException,
                                        ScriptTimeoutException )
-import time
 
 
 class TestExecuteAsyncContent(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_execute_isolate.py

@@ -2,9 +2,8 @@
 # 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 marionette_test import MarionetteTestCase, skip_if_b2g
-from marionette_driver.errors import (JavascriptException,
-                                      MarionetteException,
+from marionette import MarionetteTestCase
+from marionette_driver.errors import (MarionetteException,
                                       ScriptTimeoutException)
 
 class TestExecuteIsolationContent(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_execute_script.py

@@ -5,8 +5,8 @@
 import urllib
 
 from marionette_driver.by import By
-from marionette_driver.errors import JavascriptException, MarionetteException
-from marionette_test import MarionetteTestCase
+from marionette_driver.errors import JavascriptException
+from marionette import MarionetteTestCase
 
 def inline(doc):
     return "data:text/html;charset=utf-8,%s" % urllib.quote(doc)

testing/marionette/client/marionette/tests/unit/test_expected.py

@@ -7,7 +7,7 @@ import urllib
 from marionette_driver import expected
 from marionette_driver.by import By
 
-import marionette_test
+from marionette import marionette_test
 
 
 def inline(doc):

testing/marionette/client/marionette/tests/unit/test_expectedfail.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 class TestFail(MarionetteTestCase):
     def test_fails(self):

testing/marionette/client/marionette/tests/unit/test_findelement.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.marionette import HTMLElement
 from marionette_driver.by import By
 from marionette_driver.errors import NoSuchElementException, InvalidSelectorException

testing/marionette/client/marionette/tests/unit/test_findelement_chrome.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.marionette import HTMLElement
 from marionette_driver.by import By
 from marionette_driver.errors import NoSuchElementException

testing/marionette/client/marionette/tests/unit/test_gesture.py

@@ -2,8 +2,8 @@
 # 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 marionette_test import MarionetteTestCase
-from gestures import smooth_scroll, pinch
+from marionette import MarionetteTestCase
+from marionette.gestures import smooth_scroll
 
 class testGestures(MarionetteTestCase):
     check_in_viewport = """

testing/marionette/client/marionette/tests/unit/test_getactiveframe_oop.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class TestGetActiveFrameOOP(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_getattr.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class TestGetAttribute(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_getattr_chrome.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class TestGetAttributeChrome(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_implicit_waits.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import NoSuchElementException
 
 class TestImplicitWaits(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_import_script.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import JavascriptException
 
 class TestImportScript(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_import_script_reuse_window.py

@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 class TestImportScriptContent(MarionetteTestCase):
 

testing/marionette/client/marionette/tests/unit/test_key_actions.py

@@ -2,9 +2,9 @@
 # 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 marionette_test import (MarionetteTestCase,
-                             skip_if_b2g,
-                             skip_if_e10s)
+from marionette.marionette_test import (MarionetteTestCase,
+                                        skip_if_b2g,
+                                        skip_if_e10s)
 from marionette_driver.keys import Keys
 from marionette_driver.marionette import Actions
 

testing/marionette/client/marionette/tests/unit/test_log.py

@@ -2,8 +2,8 @@
 # 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/.
 
-import os
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
+
 
 class TestLog(MarionetteTestCase):
     def test_log_basic(self):

testing/marionette/client/marionette/tests/unit/test_marionette.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_driver import errors
-import marionette_test
+from marionette import marionette_test
 
 
 class TestHandleError(marionette_test.MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_modal_dialogs.py

@@ -2,7 +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 marionette_test import MarionetteTestCase, skip_if_e10s
+from marionette.marionette_test import MarionetteTestCase, skip_if_e10s
 from marionette_driver.errors import NoAlertPresentException, ElementNotVisibleException
 from marionette_driver.marionette import Alert
 from marionette_driver.wait import Wait

testing/marionette/client/marionette/tests/unit/test_multi_finger.py

@@ -2,8 +2,8 @@
 # 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 marionette_test import MarionetteTestCase
-from marionette import MultiActions, Actions
+from marionette import MarionetteTestCase
+from marionette.marionette import MultiActions, Actions
 
 class testMultiFinger(MarionetteTestCase):
     def test_move_element(self):

testing/marionette/client/marionette/tests/unit/test_navigation.py

@@ -2,7 +2,11 @@
 # 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 marionette_test import MarionetteTestCase, skip_if_b2g, skip_if_e10s
+from marionette.marionette_test import (
+    MarionetteTestCase,
+    skip_if_b2g,
+    skip_if_e10s
+)
 from marionette_driver.errors import MarionetteException, TimeoutException
 
 class TestNavigate(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_pagesource.py

@@ -2,7 +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 marionette_test import MarionetteTestCase, skip_if_b2g
+from marionette.marionette_test import MarionetteTestCase, skip_if_b2g
 
 class TestPageSource(MarionetteTestCase):
     def testShouldReturnTheSourceOfAPage(self):

testing/marionette/client/marionette/tests/unit/test_position.py

@@ -1,4 +1,4 @@
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class TestPosition(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_profile_management.py

@@ -4,7 +4,7 @@
 
 import os
 from marionette_driver.errors import JavascriptException
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 class TestLog(MarionetteTestCase):
     def setUp(self):

testing/marionette/client/marionette/tests/unit/test_rendered_element.py

@@ -13,7 +13,7 @@
 #See the License for the specific language governing permissions and
 #limitations under the License.
 
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class RenderedElementTests(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_report.py

@@ -2,8 +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/.
 
-import unittest
-from marionette_test import MarionetteTestCase, expectedFailure, skip
+from marionette import MarionetteTestCase, expectedFailure, skip
 
 
 class TestReport(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_run_js_test.py

@@ -1,8 +1,7 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-from marionette_test import MarionetteTestCase
-import unittest
+from marionette import MarionetteTestCase
 
 class TestRunJSTest(MarionetteTestCase):
     def test_basic(self):

testing/marionette/client/marionette/tests/unit/test_screen_orientation.py

@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_driver.errors import MarionetteException
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from mozrunner.devices.emulator_screen import EmulatorScreen
 
 default_orientation = "portrait-primary"

testing/marionette/client/marionette/tests/unit/test_screenshot.py

@@ -1,7 +1,7 @@
 import base64
 import imghdr
 
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 RED_ELEMENT_BASE64 = 'iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAVUlEQVRoge3PsQ0AIAzAsI78fzBwBhHykD2ePev80LweAAGJB1ILpBZILZBaILVAaoHUAqkFUgukFkgtkFogtUBqgdQCqQVSC6QWSC2QWiC1QGp9A7ma+7nyXgOpzQAAAABJRU5ErkJggg=='

testing/marionette/client/marionette/tests/unit/test_selected.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class TestSelected(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_selected_chrome.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class TestSelectedChrome(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_session.py

@@ -2,9 +2,9 @@
 # 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/.
 
-import marionette_test
+from marionette import MarionetteTestCase
 
-class TestSession(marionette_test.MarionetteTestCase):
+class TestSession(MarionetteTestCase):
     def setUp(self):
         super(TestSession, self).setUp()
         self.marionette.delete_session()
@@ -41,4 +41,4 @@ class TestSession(marionette_test.MarionetteTestCase):
         caps = self.marionette.start_session(session_id="ILoveCheese")
 
         self.assertEqual(self.marionette.session_id, "ILoveCheese")
-        self.assertTrue(isinstance(self.marionette.session_id, unicode))
+        self.assertTrue(isinstance(self.marionette.session_id, unicode))

testing/marionette/client/marionette/tests/unit/test_set_window_size.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_driver.errors import MarionetteException
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 class TestSetWindowSize(MarionetteTestCase):
     def setUp(self):

testing/marionette/client/marionette/tests/unit/test_simpletest_sanity.py

@@ -2,10 +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 marionette_test import MarionetteTestCase
-from marionette_driver.errors import (JavascriptException,
-                                      MarionetteException,
-                                      ScriptTimeoutException)
+from marionette import MarionetteTestCase
 
 class SimpletestSanityTest(MarionetteTestCase):
 

testing/marionette/client/marionette/tests/unit/test_single_finger.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.marionette import Actions
 from marionette_driver.errors import MarionetteException
 #add this directory to the path

testing/marionette/client/marionette/tests/unit/test_single_finger_desktop.py

@@ -1,5 +1,4 @@
-from marionette_test import MarionetteTestCase
-from marionette_driver.marionette import Actions
+from marionette import MarionetteTestCase
 from marionette_driver.errors import MarionetteException
 #add this directory to the path
 import os

testing/marionette/client/marionette/tests/unit/test_skip_setup.py

@@ -2,7 +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 marionette_test import MarionetteTestCase, SkipTest
+from marionette import MarionetteTestCase, SkipTest
 
 class TestSetUpSkipped(MarionetteTestCase):
 

testing/marionette/client/marionette/tests/unit/test_specialpowers.py

@@ -2,8 +2,8 @@
 # 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 marionette_test import MarionetteTestCase
-from marionette_driver.errors import JavascriptException, MarionetteException
+from marionette import MarionetteTestCase
+
 
 class TestSpecialPowersContent(MarionetteTestCase):
 

testing/marionette/client/marionette/tests/unit/test_submit.py

@@ -7,7 +7,7 @@ import time
 from marionette_driver.by import By
 from marionette_driver.errors import NoSuchElementException
 from marionette_driver.wait import Wait
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 class TestSubmit(MarionetteTestCase):
 

testing/marionette/client/marionette/tests/unit/test_switch_frame.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import (JavascriptException,
                                       NoSuchFrameException)
 

testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py

@@ -2,9 +2,9 @@
 # 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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import JavascriptException
-from marionette_driver.by import By
+
 
 class TestSwitchFrameChrome(MarionetteTestCase):
     def setUp(self):

testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class TestSwitchRemoteFrame(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_text.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.keys import Keys
 
 

testing/marionette/client/marionette/tests/unit/test_text_chrome.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 ''' Disabled in bug 896043 and when working on Chrome code re-enable for bug 896046

testing/marionette/client/marionette/tests/unit/test_timeouts.py

@@ -2,11 +2,9 @@
 # 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/.
 
-import os
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.marionette import HTMLElement
 from marionette_driver.errors import (NoSuchElementException,
-                                      JavascriptException,
                                       MarionetteException,
                                       ScriptTimeoutException)
 

testing/marionette/client/marionette/tests/unit/test_typing.py

@@ -2,7 +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 marionette_test import MarionetteTestCase, skip_if_b2g
+from marionette.marionette_test import MarionetteTestCase, skip_if_b2g
 from marionette_driver.keys import Keys
 from marionette_driver.errors import ElementNotVisibleException
 

testing/marionette/client/marionette/tests/unit/test_visibility.py

@@ -1,4 +1,4 @@
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 class TestVisibility(MarionetteTestCase):
 

testing/marionette/client/marionette/tests/unit/test_wait.py

@@ -9,7 +9,7 @@ from marionette_driver import errors
 from marionette_driver import wait
 from marionette_driver.wait import Wait
 
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 
 class TickingClock(object):

testing/marionette/client/marionette/tests/unit/test_window_handles.py

@@ -2,7 +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 marionette_test import MarionetteTestCase, skip_if_e10s
+from marionette.marionette_test import MarionetteTestCase, skip_if_e10s
 from marionette_driver.keys import Keys
 
 

testing/marionette/client/marionette/tests/unit/test_window_management.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import time
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 class TestSwitchWindow(MarionetteTestCase):
     def open_new_window(self):

testing/marionette/client/marionette/tests/unit/test_window_position.py

@@ -12,7 +12,7 @@
 #See the License for the specific language governing permissions and
 #limitations under the License.
 
-from marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import MarionetteException
 
 class TestWindowPosition(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_window_switching.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 from marionette_driver.by import By
 from marionette_driver.errors import NoSuchElementException

testing/marionette/client/marionette/tests/unit/test_window_title.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 #TODO use @skip_if_b2g when Bug 875921 is fixed
 class TestTitleChrome(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_window_type.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 
 class TestWindowTypeChrome(MarionetteTestCase):
     def setUp(self):

testing/marionette/client/marionette/tests/unit/test_with_using_context.py

@@ -2,7 +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 marionette_test import MarionetteTestCase
+from marionette import MarionetteTestCase
 from marionette_driver.errors import MarionetteException
 
 

testing/marionette/mach_commands.py

@@ -38,20 +38,7 @@ commandline.add_logging_group(_parser)
 def run_marionette(tests, b2g_path=None, emulator=None, testtype=None,
     address=None, binary=None, topsrcdir=None, **kwargs):
 
-    # Import the harness directly and under a different name here to avoid
-    # "marionette" being importable from two locations when "testing/marionette/client"
-    # is on sys.path.
-    # See bug 1050511 and bug 1114474. This needs to be removed with the
-    # resolution of bug 1109183.
-    clientdir = os.path.join(topsrcdir, 'testing/marionette/client')
-    if clientdir in sys.path:
-        sys.path.remove(clientdir)
-    path = os.path.join(topsrcdir, 'testing/marionette/client/marionette/runtests.py')
-    with open(path, 'r') as fh:
-        imp.load_module('marionetteharness', fh, path,
-                        ('.py', 'r', imp.PY_SOURCE))
-
-    from marionetteharness import (
+    from marionette.runtests import (
         MarionetteTestRunner,
         BaseMarionetteOptions,
         startTestRunner