Bug 1534584 Part 1 - Move selection.py to layout/base/tests/marionette/. r=whimboo
authorTing-Yu Lin <tlin@mozilla.com>
Mon, 25 Mar 2019 20:28:37 +0000
changeset 466009 6d8c85e1f976c8ea68fc501cd144bfa717abe299
parent 466008 38cd4d2c99a11ee976d0491c5a2fecab92418678
child 466010 aad29c67d0ad810a4de5dac7bd8728e5d5b56d36
push id35758
push userrgurzau@mozilla.com
push dateTue, 26 Mar 2019 09:51:47 +0000
treeherdermozilla-central@4572f6055a6a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo
bugs1534584
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1534584 Part 1 - Move selection.py to layout/base/tests/marionette/. r=whimboo selection.py is used only by AccessibleCaret tests. Differential Revision: https://phabricator.services.mozilla.com/D24447
layout/base/tests/marionette/selection.py
layout/base/tests/marionette/test_accessiblecaret_cursor_mode.py
layout/base/tests/marionette/test_accessiblecaret_selection_mode.py
testing/marionette/client/marionette_driver/__init__.py
testing/marionette/client/marionette_driver/selection.py
rename from testing/marionette/client/marionette_driver/selection.py
rename to layout/base/tests/marionette/selection.py
--- a/layout/base/tests/marionette/test_accessiblecaret_cursor_mode.py
+++ b/layout/base/tests/marionette/test_accessiblecaret_cursor_mode.py
@@ -1,18 +1,25 @@
 # -*- coding: utf-8 -*-
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 import string
+import sys
+import os
 
+# Add this directory to the import path.
+sys.path.append(os.path.dirname(__file__))
+
+from selection import (
+    SelectionManager,
+)
 from marionette_driver.by import By
 from marionette_driver.legacy_actions import Actions
-from marionette_driver.selection import SelectionManager
 from marionette_harness.marionette_test import (
     MarionetteTestCase,
     parameterized,
 )
 
 
 class AccessibleCaretCursorModeTestCase(MarionetteTestCase):
     '''Test cases for AccessibleCaret under cursor mode.
--- a/layout/base/tests/marionette/test_accessiblecaret_selection_mode.py
+++ b/layout/base/tests/marionette/test_accessiblecaret_selection_mode.py
@@ -1,18 +1,25 @@
 # -*- coding: utf-8 -*-
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 import re
+import sys
+import os
 
+# Add this directory to the import path.
+sys.path.append(os.path.dirname(__file__))
+
+from selection import (
+    SelectionManager,
+)
 from marionette_driver.by import By
 from marionette_driver.legacy_actions import Actions
-from marionette_driver.selection import SelectionManager
 from marionette_harness.marionette_test import (
     MarionetteTestCase,
     SkipTest,
     parameterized
 )
 
 
 def skip_if_not_rotatable(target):
--- a/testing/marionette/client/marionette_driver/__init__.py
+++ b/testing/marionette/client/marionette_driver/__init__.py
@@ -13,15 +13,14 @@ from marionette_driver import (
     decorators,
     errors,
     expected,
     geckoinstance,
     gestures,
     keys,
     localization,
     marionette,
-    selection,
     wait,
 )
 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