From 3de88cbfb6f9fc6fcfccad65438f7810a651908d Mon Sep 17 00:00:00 2001 From: David Burns Date: Mon, 23 Feb 2015 14:43:37 +0000 Subject: [PATCH] Bug 1107336: Update layout tests to use new Marionette Driver; r=jgriffin --- layout/base/tests/marionette/test_selectioncarets.py | 9 +++++---- .../marionette/test_selectioncarets_multiplerange.py | 8 ++++---- layout/base/tests/marionette/test_touchcaret.py | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/layout/base/tests/marionette/test_selectioncarets.py b/layout/base/tests/marionette/test_selectioncarets.py index c7be1d3fb80..0bd6113ad4d 100644 --- a/layout/base/tests/marionette/test_selectioncarets.py +++ b/layout/base/tests/marionette/test_selectioncarets.py @@ -3,12 +3,13 @@ # 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 marionette_driver.selection import SelectionManager +from marionette_driver.gestures import long_press_without_contextmenu + from math import ceil, floor -from selection import SelectionManager -from gestures import long_press_without_contextmenu class SelectionCaretsTest(MarionetteTestCase): diff --git a/layout/base/tests/marionette/test_selectioncarets_multiplerange.py b/layout/base/tests/marionette/test_selectioncarets_multiplerange.py index 044c033c635..22f27111ed3 100644 --- a/layout/base/tests/marionette/test_selectioncarets_multiplerange.py +++ b/layout/base/tests/marionette/test_selectioncarets_multiplerange.py @@ -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): diff --git a/layout/base/tests/marionette/test_touchcaret.py b/layout/base/tests/marionette/test_touchcaret.py index 9ef93af1b43..61a37760936 100644 --- a/layout/base/tests/marionette/test_touchcaret.py +++ b/layout/base/tests/marionette/test_touchcaret.py @@ -3,10 +3,10 @@ # 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_driver.selection import SelectionManager from marionette_test import MarionetteTestCase -from selection import SelectionManager class TouchCaretTest(MarionetteTestCase):