Bug 1096488 - Unskip marionette test navigating to non-remote pages.;r=automatedtester
authorChris Manchester <cmanchester@mozilla.com>
Tue, 10 Mar 2015 16:19:40 -0700
changeset 232882 9e174f63f46fa82926faedb033dba98fe55028a3
parent 232881 fd8e079d63359725bae730fec4fbe433d3995048
child 232883 d6956145538bcbcb4a7ab643d1494d06ecd955c1
push id56671
push usercmanchester@mozilla.com
push dateTue, 10 Mar 2015 23:19:46 +0000
treeherdermozilla-inbound@bca6e36655a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester
bugs1096488
milestone39.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 1096488 - Unskip marionette test navigating to non-remote pages.;r=automatedtester
testing/marionette/client/marionette/tests/unit/test_key_actions.py
testing/marionette/client/marionette/tests/unit/test_navigation.py
testing/marionette/client/marionette/tests/unit/test_window_handles.py
--- a/testing/marionette/client/marionette/tests/unit/test_key_actions.py
+++ b/testing/marionette/client/marionette/tests/unit/test_key_actions.py
@@ -1,15 +1,13 @@
 # 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/.
 
-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
 
 class TestKeyActions(MarionetteTestCase):
 
     def setUp(self):
         MarionetteTestCase.setUp(self)
         if self.marionette.session_capabilities['platformName'] == 'DARWIN':
@@ -65,26 +63,25 @@ class TestKeyActions(MarionetteTestCase)
         (self.key_action.key_down(self.mod_key)
                         .key_down('a')
                         .wait(.5)
                         .key_down('x')
                         .perform())
         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
         (self.key_action.key_down(Keys.SHIFT)
                         .press(el)
                         .release()
                         .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
         self.marionette.switch_to_window(new_win)
         self.marionette.close()
         self.marionette.switch_to_window(start_win)
         self.assertEqual(self.key_reporter_value, "")
--- a/testing/marionette/client/marionette/tests/unit/test_navigation.py
+++ b/testing/marionette/client/marionette/tests/unit/test_navigation.py
@@ -1,17 +1,13 @@
 # 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/.
 
-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):
     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)
@@ -76,31 +72,29 @@ class TestNavigate(MarionetteTestCase):
         self.marionette.navigate(self.marionette.absolute_url("test_iframe.html"))
         self.marionette.switch_to_frame(0)
         self.marionette.navigate(self.marionette.absolute_url("empty.html"))
         self.assertTrue('empty.html' in self.marionette.get_url())
         self.marionette.switch_to_frame()
         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://")
             self.fail("Should have thrown a MarionetteException")
         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")
 
--- a/testing/marionette/client/marionette/tests/unit/test_window_handles.py
+++ b/testing/marionette/client/marionette/tests/unit/test_window_handles.py
@@ -1,19 +1,18 @@
 # 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/.
 
-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':
             keys.append(Keys.META)
         else:
             keys.append(Keys.CONTROL)
         keys.append('a')
 
@@ -60,20 +59,23 @@ class TestWindowHandles(MarionetteTestCa
         self.assertIn('windowHandles.html', self.marionette.get_url())
         self.assertEqual(self.marionette.title, "Marionette New Tab Link")
 
         self.marionette.close()
         self.marionette.switch_to_window(dest_win)
         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)
         self.assertEqual(len(self.marionette.chrome_window_handles), 2)
         windows = self.marionette.window_handles
         windows.remove(start_tab)
         dest_tab = windows.pop()
         self.marionette.switch_to_window(dest_tab)
@@ -87,18 +89,16 @@ class TestWindowHandles(MarionetteTestCa
             self.wait_for_condition(lambda mn: len(mn.window_handles) == i + 3)
             self.assertEqual(len(self.marionette.chrome_window_handles), 2)
 
         self.marionette.close_chrome_window()
         self.assertEqual(len(self.marionette.chrome_window_handles), 1)
         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)