Bug 1107336: selection tests imports for marionette; r=jgriffin

This commit is contained in:
David Burns 2015-01-09 21:42:06 +00:00
parent 467073cb64
commit 56bedd28bc
4 changed files with 13 additions and 38 deletions

View File

@ -3,11 +3,11 @@
# 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 by import By
from marionette import Actions
from marionette_driver.by import By
from marionette_driver.marionette import Actions
from marionette_test import MarionetteTestCase
from selection import SelectionManager
from gestures import long_press_without_contextmenu
from marionette_driver.selection import SelectionManager
from marionette_driver.gestures import long_press_without_contextmenu
class SelectionCaretsTest(MarionetteTestCase):

View File

@ -3,11 +3,11 @@
# 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 by import By
from marionette import Actions
from marionette_driver.by import By
from marionette_driver.marionette import Actions
from marionette_test import MarionetteTestCase
from selection import SelectionManager
from gestures import long_press_without_contextmenu
from marionette_driver.selection import SelectionManager
from marionette_driver.gestures import long_press_without_contextmenu
class SelectionCaretsMultipleRangeTest(MarionetteTestCase):

View File

@ -2,33 +2,7 @@
# 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_driver.gestures import smooth_scroll, pinch
from marionette_driver.by import By
from marionette_driver.marionette import Marionette, HTMLElement, Actions, MultiActions
from marionette_test import MarionetteTestCase, MarionetteJSTestCase, CommonTestCase, expectedFailure, skip, SkipTest
from marionette_driver.errors import (
ElementNotVisibleException,
ElementNotAccessibleException,
ErrorCodes,
FrameSendFailureError,
FrameSendNotInitializedError,
InvalidCookieDomainException,
InvalidElementStateException,
InvalidResponseException,
InvalidSelectorException,
JavascriptException,
MarionetteException,
MoveTargetOutOfBoundsException,
NoAlertPresentException,
NoSuchElementException,
NoSuchFrameException,
NoSuchWindowException,
ScriptTimeoutException,
StaleElementException,
TimeoutException,
UnableToSetCookieException,
XPathLookupException,
)
from runner import (
B2GTestCaseMixin,
B2GTestResultMixin,
@ -50,6 +24,3 @@ from runner import (
TestResult,
TestResultCollection
)
from marionette_driver.wait import Wait
from marionette_driver.date_time_value import DateTimeValue
import marionette_driver.decorators

View File

@ -1,4 +1,8 @@
from marionette_driver import ( errors, by, decorators, expected, geckoinstance,
gestures, keys, marionette, selection, wait,
application_cache, date_time_value )
from marionette_driver.gestures import smooth_scroll, pinch
from marionette_driver.by import By
from marionette_driver.date_time_value import DateTimeValue
from marionette_driver.gestures import smooth_scroll, pinch
from marionette_driver.wait import Wait