wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1096488 - Unskip marionette test navigating to non-remote pages.;r=automatedtester

Browse Source
This commit is contained in:
Chris Manchester 2015-03-10 16:19:40 -07:00
parent 4562de3097
commit 2fbf6585b0
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testing/marionette/client/marionette/tests/unit/test_key_actions.py
View File

@ -2,9 +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.marionette_test import (MarionetteTestCase,
skip_if_b2g,
skip_if_e10s)
from marionette.marionette_test import MarionetteTestCase, skip_if_b2g
from marionette_driver.keys import Keys
from marionette_driver.marionette import Actions
@ -70,7 +68,6 @@ class TestKeyActions(MarionetteTestCase):
self.assertEqual(self.key_reporter_value, "")
@skip_if_b2g
@skip_if_e10s
def test_open_in_new_window_shortcut(self):
el = self.marionette.find_element('id', 'updatediv')
start_win = self.marionette.current_chrome_window_handle
@ -80,7 +77,7 @@ class TestKeyActions(MarionetteTestCase):
.key_up(Keys.SHIFT)
.perform())
self.wait_for_condition(
lambda mn: len(self.marionette.chrome_window_handles) == 2)
lambda mn: len(self.marionette.window_handles) == 2)
chrome_window_handles = self.marionette.chrome_window_handles
chrome_window_handles.remove(start_win)
[new_win] = chrome_window_handles

8
testing/marionette/client/marionette/tests/unit/test_navigation.py
View File

@ -2,11 +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.marionette_test import (
MarionetteTestCase,
skip_if_b2g,
skip_if_e10s
)
from marionette.marionette_test import MarionetteTestCase, skip_if_b2g
from marionette_driver.errors import MarionetteException, TimeoutException
class TestNavigate(MarionetteTestCase):
@ -81,7 +77,6 @@ class TestNavigate(MarionetteTestCase):
self.assertTrue('test_iframe.html' in self.marionette.get_url())
'''
@skip_if_e10s # Interactions with about: pages need e10s support (bug 1096488).
def test_shouldnt_error_if_nonexistent_url_used(self):
try:
self.marionette.navigate("thisprotocoldoesnotexist://")
@ -95,7 +90,6 @@ class TestNavigate(MarionetteTestCase):
print traceback.format_exc()
self.fail("Should have thrown a MarionetteException instead of %s" % type(inst))
@skip_if_e10s # Interactions with about: pages need e10s support (bug 1096488).
@skip_if_b2g # about:blocked isn't a well formed uri on b2g
def test_should_navigate_to_requested_about_page(self):
self.marionette.navigate("about:neterror")

10
testing/marionette/client/marionette/tests/unit/test_window_handles.py
View File

@ -2,13 +2,12 @@
# 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.marionette_test import MarionetteTestCase, skip_if_e10s
from marionette import MarionetteTestCase
from marionette_driver.keys import Keys
class TestWindowHandles(MarionetteTestCase):
@skip_if_e10s # Interactions with about: pages need e10s support (bug 1096488).
def test_new_tab_window_handles(self):
keys = [Keys.SHIFT]
if self.marionette.session_capabilities['platformName'] == 'DARWIN':
@ -65,10 +64,13 @@ class TestWindowHandles(MarionetteTestCase):
self.assertEqual(self.marionette.get_url(), "about:blank")
def test_chrome_windows(self):
start_tab = self.marionette.current_window_handle
opener_page = self.marionette.absolute_url("windowHandles.html")
self.marionette.navigate(opener_page)
# Window handles don't persist in cases of remoteness change.
start_tab = self.marionette.current_window_handle
self.marionette.find_element("id", "new-window").click()
self.assertEqual(len(self.marionette.window_handles), 2)
@ -92,8 +94,6 @@ class TestWindowHandles(MarionetteTestCase):
self.assertEqual(len(self.marionette.window_handles), 1)
self.marionette.switch_to_window(start_tab)
# This sequence triggers an exception in Marionette:register with e10s on (bug 1120809).
@skip_if_e10s
def test_tab_and_window_handles(self):
start_tab = self.marionette.current_window_handle
start_chrome_window = self.marionette.current_chrome_window_handle