Bug 983821 - 'marionette' cli entrypoint doesn't have access to proper packages. r=dburns
authorJulien Pagès <j.parkouss@gmail.com>
Sat, 11 Jul 2015 08:05:51 +0200
changeset 252526 b1ff86fd9890b5ccf634c75babb38bb427406542
parent 252525 063a7521a10bb65222b30f5ff9f41e99f7ce4cb0
child 252527 667e2c8fa5dde0ae6e2811a59cafcc7fa5f6b140
push id29035
push usercbook@mozilla.com
push dateMon, 13 Jul 2015 09:52:17 +0000
treeherdermozilla-central@38d03bf4616e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdburns
bugs983821
milestone42.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 983821 - 'marionette' cli entrypoint doesn't have access to proper packages. r=dburns
testing/marionette/client/marionette/__init__.py
testing/marionette/client/marionette/b2g_update_test.py
testing/marionette/client/marionette/runtests.py
--- a/testing/marionette/client/marionette/__init__.py
+++ b/testing/marionette/client/marionette/__init__.py
@@ -1,14 +1,14 @@
 # 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_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,
         BaseMarionetteTestRunner,
         BrowserMobProxyTestCaseMixin,
         EnduranceOptionsMixin,
         EnduranceTestCaseMixin,
         HTMLReportingOptionsMixin,
@@ -18,9 +18,9 @@ from runner import (
         MarionetteTest,
         MarionetteTestResult,
         MarionetteTextTestRunner,
         MemoryEnduranceTestCaseMixin,
         OptionParser,
         TestManifest,
         TestResult,
         TestResultCollection
-)
\ No newline at end of file
+)
--- a/testing/marionette/client/marionette/b2g_update_test.py
+++ b/testing/marionette/client/marionette/b2g_update_test.py
@@ -7,21 +7,21 @@ import imp
 import os
 import re
 import subprocess
 import time
 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
     CONNECT_TIMEOUT = 30
     SEND_TIMEOUT    = 60 * 5
     MAX_RETRIES     = 24
 
     def __init__(self, addr, port, runner):
--- a/testing/marionette/client/marionette/runtests.py
+++ b/testing/marionette/client/marionette/runtests.py
@@ -1,17 +1,17 @@
 # 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/.
 
 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
     )
 
 
 class MarionetteTestRunner(BaseMarionetteTestRunner):
     def __init__(self, **kwargs):