Backed out changeset c886cd910936 (bug 1107336)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 21 Jan 2015 16:12:13 +0100
changeset 242426 6a8652278bbcaeda0c4dec1c038157f81d189aa6
parent 242425 bccb1b8a948e903e9d1de8b775d8d2675dbd8ab6
child 242427 24def2d94aceafb0a1db57fbc52de2e36993f8a8
push id7677
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 18:11:24 +0000
treeherdermozilla-aurora@f531d838c055 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1107336
milestone38.0a1
backs outc886cd910936b6f1f3e79bf973aab1c445770ea3
Backed out changeset c886cd910936 (bug 1107336)
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,4 +1,3 @@
 -r mozbase_requirements.txt
 ../marionette/transport
-../marionette/driver
 ../marionette
rename from testing/marionette/driver/marionette_driver/application_cache.py
rename to testing/marionette/client/marionette/application_cache.py
rename from testing/marionette/driver/marionette_driver/by.py
rename to testing/marionette/client/marionette/by.py
rename from testing/marionette/driver/marionette_driver/date_time_value.py
rename to testing/marionette/client/marionette/date_time_value.py
rename from testing/marionette/driver/marionette_driver/decorators.py
rename to testing/marionette/client/marionette/decorators.py
rename from testing/marionette/driver/marionette_driver/errors.py
rename to testing/marionette/client/marionette/errors.py
rename from testing/marionette/driver/marionette_driver/expected.py
rename to testing/marionette/client/marionette/expected.py
rename from testing/marionette/driver/marionette_driver/geckoinstance.py
rename to testing/marionette/client/marionette/geckoinstance.py
rename from testing/marionette/driver/marionette_driver/gestures.py
rename to testing/marionette/client/marionette/gestures.py
rename from testing/marionette/driver/marionette_driver/keys.py
rename to testing/marionette/client/marionette/keys.py
rename from testing/marionette/driver/marionette_driver/marionette.py
rename to testing/marionette/client/marionette/marionette.py
--- a/testing/marionette/client/marionette/marionette_test.py
+++ b/testing/marionette/client/marionette/marionette_test.py
@@ -9,29 +9,28 @@ import functools
 import sys
 import socket
 import time
 import types
 import unittest
 import weakref
 import warnings
 
-
-from marionette_driver.errors import (
+from 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_driver.marionette import Marionette
+from marionette import Marionette
 from mozlog.structured.structuredlog import get_default_logger
-from marionette_driver.wait import Wait
-from marionette_driver.expected import element_present, element_not_present
+from wait import Wait
+from 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_driver.marionette import Marionette
+from 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
 
 
rename from testing/marionette/driver/marionette_driver/selection.py
rename to testing/marionette/client/marionette/selection.py
rename from testing/marionette/driver/marionette_driver/wait.py
rename to testing/marionette/client/marionette/wait.py
deleted file mode 100644
--- a/testing/marionette/driver/marionette_driver/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
--- a/testing/marionette/driver/requirements.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-marionette-transport == 0.4
\ No newline at end of file
deleted file mode 100644
--- a/testing/marionette/driver/setup.py
+++ /dev/null
@@ -1,27 +0,0 @@
-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,
-      )
-