Bug 983821 - 'marionette' cli entrypoint doesn't have access to proper packages. r=dburns

--HG--
extra : commitid : EF5ytBCZpuw
extra : rebase_source : 3ec79224fb63ba722c28e7bf00ab76bad721bcff

testing/marionette/client/marionette/__init__.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, MarionetteJSTestCase, CommonTestCase, expectedFailure, skip, SkipTest
-from runner import (
+from .marionette_test import MarionetteTestCase, MarionetteJSTestCase, CommonTestCase, expectedFailure, skip, SkipTest
+from .runner import (
         B2GTestCaseMixin,
         B2GTestResultMixin,
         BaseMarionetteOptions,
@@ -23,4 +23,4 @@ from runner import (
         TestManifest,
         TestResult,
         TestResultCollection
-)
+)

testing/marionette/client/marionette/b2g_update_test.py

@@ -12,11 +12,11 @@ import types
 import weakref
 
 from marionette_driver.marionette import Marionette
-from marionette_test import MarionetteTestCase
+from .marionette_test import MarionetteTestCase
 from marionette_transport import MarionetteTransport
 
 from b2ginstance import B2GInstance
-from runtests import MarionetteTestRunner, cli
+from .runtests import MarionetteTestRunner, cli
 
 class B2GUpdateMarionetteClient(MarionetteTransport):
     RETRY_TIMEOUT   = 5

testing/marionette/client/marionette/runtests.py

@@ -4,9 +4,9 @@
 
 import sys
 
-from marionette_test import MarionetteTestCase, MarionetteJSTestCase
+from marionette.marionette_test import MarionetteTestCase, MarionetteJSTestCase
 from mozlog import structured
-from runner import (
+from marionette.runner import (
     BaseMarionetteTestRunner,
     BaseMarionetteOptions,
     BrowserMobProxyOptionsMixin