Bug 1107336: Move marionette code for driving the browser out of the runner; r=jgriffin

testing/config/marionette_requirements.txt

@@ -1,3 +1,4 @@
 -r mozbase_requirements.txt
 ../marionette/transport
+../marionette/driver
 ../marionette

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/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 )

testing/marionette/driver/requirements.txt

@@ -0,0 +1 @@
+marionette-transport == 0.4

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,
+      )
+