diff --git a/browser/components/loop/test/functional/test_1_browser_call.py b/browser/components/loop/test/functional/test_1_browser_call.py index 4a2778d01a7..078dbdfbbf1 100644 --- a/browser/components/loop/test/functional/test_1_browser_call.py +++ b/browser/components/loop/test/functional/test_1_browser_call.py @@ -1,14 +1,13 @@ from marionette_test import MarionetteTestCase - -from marionette_driver.by import By -from marionette_driver.errors import NoSuchElementException, StaleElementException +from by import By +import urlparse +from errors import NoSuchElementException, StaleElementException # noinspection PyUnresolvedReferences -from marionette_driver.wait import Wait +from wait import Wait +from time import sleep import os import sys -import urlparse -from time import sleep sys.path.insert(1, os.path.dirname(os.path.abspath(__file__))) from serversetup import LoopTestServers diff --git a/testing/marionette/client/marionette/tests/unit/test_navigation.py b/testing/marionette/client/marionette/tests/unit/test_navigation.py index e20733c4e7b..fb574ffda44 100644 --- a/testing/marionette/client/marionette/tests/unit/test_navigation.py +++ b/testing/marionette/client/marionette/tests/unit/test_navigation.py @@ -2,14 +2,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 marionette_test import MarionetteTestCase, skip_if_b2g, skip_if_e10s -from marionette_driver.errors import MarionetteException, TimeoutException class TestNavigate(MarionetteTestCase): def test_navigate(self): self.assertTrue(self.marionette.execute_script("window.location.href = 'about:blank'; return true;")) self.assertEqual("about:blank", self.marionette.execute_script("return window.location.href;")) - test_html = self.marionette.absolute_url("test.html") self.marionette.navigate(test_html) self.assertNotEqual("about:blank", self.marionette.execute_script("return window.location.href;")) self.assertEqual("Marionette Test", self.marionette.title) @@ -77,7 +74,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://") @@ -85,20 +81,8 @@ class TestNavigate(MarionetteTestCase): except TimeoutException: self.fail("The socket shouldn't have timed out when navigating to a non-existent URL") except MarionetteException as e: - self.assertIn("Error loading page", str(e)) - except Exception as inst: - import traceback - 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") - self.assertEqual(self.marionette.get_url(), "about:neterror") - self.marionette.navigate(self.marionette.absolute_url("test.html")) self.marionette.navigate("about:blocked") - self.assertEqual(self.marionette.get_url(), "about:blocked") def test_find_element_state_complete(self): test_html = self.marionette.absolute_url("test.html") diff --git a/testing/marionette/client/marionette/tests/unit/test_window_handles.py b/testing/marionette/client/marionette/tests/unit/test_window_handles.py index e3e192c44ec..bb090af95f7 100644 --- a/testing/marionette/client/marionette/tests/unit/test_window_handles.py +++ b/testing/marionette/client/marionette/tests/unit/test_window_handles.py @@ -2,13 +2,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 marionette_test import MarionetteTestCase, skip_if_e10s -from marionette_driver.keys import Keys +from marionette 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': @@ -92,66 +89,5 @@ 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 - tab_open_page = self.marionette.absolute_url("windowHandles.html") - window_open_page = self.marionette.absolute_url("test_windows.html") - # Open a new tab and switch to it. - self.marionette.navigate(tab_open_page) - link = self.marionette.find_element("id", "new-tab") - link.click() - - self.wait_for_condition(lambda mn: len(mn.window_handles) == 2) - self.assertEqual(len(self.marionette.chrome_window_handles), 1) - self.assertEqual(self.marionette.current_chrome_window_handle, start_chrome_window) - - handles = self.marionette.window_handles - handles.remove(start_tab) - - new_tab = handles.pop() - self.marionette.switch_to_window(new_tab) - self.assertEqual(self.marionette.get_url(), "about:blank") - - # Open a new window from the new tab. - self.marionette.navigate(window_open_page) - - link = self.marionette.find_element("link text", "Open new window") - link.click() - self.wait_for_condition(lambda mn: len(mn.window_handles) == 3) - - self.assertEqual(len(self.marionette.chrome_window_handles), 2) - self.assertEqual(self.marionette.current_chrome_window_handle, start_chrome_window) - - # Find the new window and switch to it. - handles = self.marionette.window_handles - handles.remove(start_tab) - handles.remove(new_tab) - new_window = handles.pop() - - self.marionette.switch_to_window(new_window) - results_page = self.marionette.absolute_url("resultPage.html") - self.assertEqual(self.marionette.get_url(), results_page) - - self.assertEqual(len(self.marionette.chrome_window_handles), 2) - self.assertNotEqual(self.marionette.current_chrome_window_handle, start_chrome_window) - - # Return to our original tab and close it. - self.marionette.switch_to_window(start_tab) - self.marionette.close() - self.assertEquals(len(self.marionette.window_handles), 2) - - # Close the opened window and carry on in our new tab. - self.marionette.switch_to_window(new_window) - self.marionette.close() - self.assertEqual(len(self.marionette.window_handles), 1) - - self.marionette.switch_to_window(new_tab) - self.assertEqual(self.marionette.get_url(), results_page) - self.marionette.navigate("about:blank") - - self.assertEqual(len(self.marionette.chrome_window_handles), 1) - self.assertEqual(self.marionette.current_chrome_window_handle, start_chrome_window)