Bug 1107336: Move marionette code for driving the browser out of the runner; r=jgriffin
☠☠ backed out by fe79362ffaaf ☠ ☠
authorDavid Burns <dburns@mozilla.com>
Tue, 09 Dec 2014 20:33:03 +0000
changeset 255801 0d04801bb2f083816da1b290f2247dae4cd82982
parent 255800 60d9d4d20971d431878723741b04b2d7678f5f1c
child 255802 399a436c6e5fc19011422307e55d361d150a15a1
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin
bugs1107336
milestone38.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 1107336: Move marionette code for driving the browser out of the runner; r=jgriffin
testing/config/marionette_requirements.txt
testing/marionette/client/marionette/application_cache.py
testing/marionette/client/marionette/by.py
testing/marionette/client/marionette/date_time_value.py
testing/marionette/client/marionette/decorators.py
testing/marionette/client/marionette/errors.py
testing/marionette/client/marionette/expected.py
testing/marionette/client/marionette/geckoinstance.py
testing/marionette/client/marionette/gestures.py
testing/marionette/client/marionette/keys.py
testing/marionette/client/marionette/marionette.py
testing/marionette/client/marionette/marionette_test.py
testing/marionette/client/marionette/runner/base.py
testing/marionette/client/marionette/selection.py
testing/marionette/client/marionette/wait.py
testing/marionette/driver/marionette_driver/__init__.py
testing/marionette/driver/marionette_driver/application_cache.py
testing/marionette/driver/marionette_driver/by.py
testing/marionette/driver/marionette_driver/date_time_value.py
testing/marionette/driver/marionette_driver/decorators.py
testing/marionette/driver/marionette_driver/errors.py
testing/marionette/driver/marionette_driver/expected.py
testing/marionette/driver/marionette_driver/geckoinstance.py
testing/marionette/driver/marionette_driver/gestures.py
testing/marionette/driver/marionette_driver/keys.py
testing/marionette/driver/marionette_driver/marionette.py
testing/marionette/driver/marionette_driver/selection.py
testing/marionette/driver/marionette_driver/wait.py
testing/marionette/driver/requirements.txt
testing/marionette/driver/setup.py
--- a/testing/config/marionette_requirements.txt
+++ b/testing/config/marionette_requirements.txt
@@ -1,3 +1,4 @@
 -r mozbase_requirements.txt
 ../marionette/transport
+../marionette/driver
 ../marionette
--- a/testing/marionette/client/marionette/marionette_test.py
+++ b/testing/marionette/client/marionette/marionette_test.py
@@ -9,28 +9,29 @@ import functools
 import sys
 import socket
 import time
 import types
 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,
         NoSuchFrameException, InvalidElementStateException, NoAlertPresentException,
         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):
     """
     Raise this exception in a test to skip it.
 
     Usually you can use TestResult.skip() or one of the skipping decorators
     instead of raising this directly.
--- a/testing/marionette/client/marionette/runner/base.py
+++ b/testing/marionette/client/marionette/runner/base.py
@@ -12,17 +12,17 @@ import random
 import socket
 import sys
 import time
 import traceback
 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
 from moztest.adapters.unit import StructuredTestRunner, StructuredTestResult
 from moztest.results import TestResultCollection, TestResult, relevant_line
 import mozversion
 
 
new file mode 100644
--- /dev/null
+++ b/testing/marionette/driver/marionette_driver/__init__.py
@@ -0,0 +1,3 @@
+from marionette_driver import ( errors, by, decorators, expected, geckoinstance,
+                                gestures, keys, marionette, selection, wait,
+                                application_cache, date_time_value )
\ No newline at end of file
rename from testing/marionette/client/marionette/application_cache.py
rename to testing/marionette/driver/marionette_driver/application_cache.py
rename from testing/marionette/client/marionette/by.py
rename to testing/marionette/driver/marionette_driver/by.py
rename from testing/marionette/client/marionette/date_time_value.py
rename to testing/marionette/driver/marionette_driver/date_time_value.py
rename from testing/marionette/client/marionette/decorators.py
rename to testing/marionette/driver/marionette_driver/decorators.py
rename from testing/marionette/client/marionette/errors.py
rename to testing/marionette/driver/marionette_driver/errors.py
rename from testing/marionette/client/marionette/expected.py
rename to testing/marionette/driver/marionette_driver/expected.py
rename from testing/marionette/client/marionette/geckoinstance.py
rename to testing/marionette/driver/marionette_driver/geckoinstance.py
rename from testing/marionette/client/marionette/gestures.py
rename to testing/marionette/driver/marionette_driver/gestures.py
rename from testing/marionette/client/marionette/keys.py
rename to testing/marionette/driver/marionette_driver/keys.py
rename from testing/marionette/client/marionette/marionette.py
rename to testing/marionette/driver/marionette_driver/marionette.py
rename from testing/marionette/client/marionette/selection.py
rename to testing/marionette/driver/marionette_driver/selection.py
rename from testing/marionette/client/marionette/wait.py
rename to testing/marionette/driver/marionette_driver/wait.py
new file mode 100644
--- /dev/null
+++ b/testing/marionette/driver/requirements.txt
@@ -0,0 +1,1 @@
+marionette-transport == 0.4
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/testing/marionette/driver/setup.py
@@ -0,0 +1,27 @@
+import os
+from setuptools import setup, find_packages
+import sys
+
+version = '0.1.0'
+
+# dependencies
+with open('requirements.txt') as f:
+    deps = f.read().splitlines()
+
+setup(name='marionette_driver',
+      version=version,
+      description="Marionette Driver",
+      long_description='See http://marionette-driver.readthedocs.org/',
+      classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      keywords='mozilla',
+      author='Auto-tools',
+      author_email='tools-marionette@lists.mozilla.org',
+      url='https://wiki.mozilla.org/Auto-tools/Projects/Marionette',
+      license='MPL',
+      packages=find_packages(),
+      #package_data={'marionette_driver': ['touch/*.js']},
+      include_package_data=True,
+      zip_safe=False,
+      install_requires=deps,
+      )
+