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

--HG--
rename : testing/marionette/client/marionette/application_cache.py => testing/marionette/driver/marionette_driver/application_cache.py
rename : testing/marionette/client/marionette/by.py => testing/marionette/driver/marionette_driver/by.py
rename : testing/marionette/client/marionette/date_time_value.py => testing/marionette/driver/marionette_driver/date_time_value.py
rename : testing/marionette/client/marionette/decorators.py => testing/marionette/driver/marionette_driver/decorators.py
rename : testing/marionette/client/marionette/errors.py => testing/marionette/driver/marionette_driver/errors.py
rename : testing/marionette/client/marionette/expected.py => testing/marionette/driver/marionette_driver/expected.py
rename : testing/marionette/client/marionette/geckoinstance.py => testing/marionette/driver/marionette_driver/geckoinstance.py
rename : testing/marionette/client/marionette/gestures.py => testing/marionette/driver/marionette_driver/gestures.py
rename : testing/marionette/client/marionette/keys.py => testing/marionette/driver/marionette_driver/keys.py
rename : testing/marionette/client/marionette/marionette.py => testing/marionette/driver/marionette_driver/marionette.py
rename : testing/marionette/client/marionette/selection.py => testing/marionette/driver/marionette_driver/selection.py
rename : testing/marionette/client/marionette/wait.py => testing/marionette/driver/marionette_driver/wait.py
extra : rebase_source : 4fa2501172cc1dedf20e2f236b32fe3bbfc30b4f
This commit is contained in:
David Burns 2014-12-09 20:33:03 +00:00
Родитель 988973a3d8
Коммит 79f2d9d1f3
18 изменённых файлов: 38 добавлений и 5 удалений

Просмотреть файл

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

Просмотреть файл

@ -14,7 +14,8 @@ import unittest
import weakref import weakref
import warnings import warnings
from errors import (
from marionette_driver.errors import (
ErrorCodes, MarionetteException, InstallGeckoError, TimeoutException, InvalidResponseException, ErrorCodes, MarionetteException, InstallGeckoError, TimeoutException, InvalidResponseException,
JavascriptException, NoSuchElementException, XPathLookupException, NoSuchWindowException, JavascriptException, NoSuchElementException, XPathLookupException, NoSuchWindowException,
StaleElementException, ScriptTimeoutException, ElementNotVisibleException, StaleElementException, ScriptTimeoutException, ElementNotVisibleException,
@ -22,10 +23,10 @@ from errors import (
InvalidCookieDomainException, UnableToSetCookieException, InvalidSelectorException, InvalidCookieDomainException, UnableToSetCookieException, InvalidSelectorException,
MoveTargetOutOfBoundsException, FrameSendNotInitializedError, FrameSendFailureError MoveTargetOutOfBoundsException, FrameSendNotInitializedError, FrameSendFailureError
) )
from marionette import Marionette from marionette_driver.marionette import Marionette
from mozlog.structured.structuredlog import get_default_logger from mozlog.structured.structuredlog import get_default_logger
from wait import Wait from marionette_driver.wait import Wait
from expected import element_present, element_not_present from marionette_driver.expected import element_present, element_not_present
class SkipTest(Exception): class SkipTest(Exception):

Просмотреть файл

@ -17,7 +17,7 @@ import unittest
import xml.dom.minidom as dom import xml.dom.minidom as dom
from manifestparser import TestManifest 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 mixins.b2g import B2GTestResultMixin, get_b2g_pid, get_dm
from mozhttpd import MozHttpd from mozhttpd import MozHttpd
from mozlog.structured.structuredlog import get_default_logger from mozlog.structured.structuredlog import get_default_logger

Просмотреть файл

@ -0,0 +1,3 @@
from marionette_driver import ( errors, by, decorators, expected, geckoinstance,
gestures, keys, marionette, selection, wait,
application_cache, date_time_value )

Просмотреть файл

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

Просмотреть файл

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