Bug 1120630 - Skip tests failing with e10s enabled.;r=jgriffin

testing/marionette/client/marionette/tests/unit/test_navigation.py

@@ -2,7 +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_test import MarionetteTestCase, skip_if_b2g
+from marionette_test import MarionetteTestCase, skip_if_b2g, skip_if_e10s
 from errors import MarionetteException, TimeoutException
 
 class TestNavigate(MarionetteTestCase):
@@ -77,6 +77,7 @@ 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://")
@@ -90,6 +91,7 @@ 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")

testing/marionette/client/marionette/tests/unit/test_window_handles.py

@@ -2,12 +2,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 marionette_test import MarionetteTestCase
+from marionette_test import MarionetteTestCase, skip_if_e10s
 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':
@@ -91,6 +92,8 @@ 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