Bug 1082773: Disable Marionette Chrome Tests on B2G; r=me
authorDavid Burns <dburns@mozilla.com>
Thu, 02 Apr 2015 14:44:17 +0100
changeset 237273 7a225cd2b55257ac6fb599099640600c5734bf5c
parent 237272 77ddd2a50c2dcfedac9f5e7229881840cea385d9
child 237274 0115bb737f640705a22577733a047d95930b1904
push id57902
push userdburns@mozilla.com
push dateThu, 02 Apr 2015 13:47:02 +0000
treeherdermozilla-inbound@7a225cd2b552 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1082773
milestone40.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 1082773: Disable Marionette Chrome Tests on B2G; r=me
testing/marionette/client/marionette/tests/unit/test_window_title.py
testing/marionette/client/marionette/tests/unit/unit-tests.ini
--- a/testing/marionette/client/marionette/tests/unit/test_window_title.py
+++ b/testing/marionette/client/marionette/tests/unit/test_window_title.py
@@ -1,15 +1,15 @@
 # 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 import MarionetteTestCase
+from marionette.marionette_test import MarionetteTestCase, skip_if_b2g
 
-#TODO use @skip_if_b2g when Bug 875921 is fixed
+@skip_if_b2g
 class TestTitleChrome(MarionetteTestCase):
     def setUp(self):
         MarionetteTestCase.setUp(self)
         self.marionette.set_context("chrome")
         self.win = self.marionette.current_window_handle
         self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', 'foo', 'chrome,centerscreen');")
         self.marionette.switch_to_window('foo')
         self.assertNotEqual(self.win, self.marionette.current_window_handle)
@@ -25,9 +25,8 @@ class TestTitleChrome(MarionetteTestCase
         self.assertEqual(title, self.marionette.title)
         self.assertEqual('Title Test', self.marionette.title)
 
 class TestTitle(MarionetteTestCase):
     def test_get_html_title(self):
         test_html = self.marionette.absolute_url("test.html")
         self.marionette.navigate(test_html)
         self.assertEqual('Marionette Test', self.marionette.title)
-
--- a/testing/marionette/client/marionette/tests/unit/unit-tests.ini
+++ b/testing/marionette/client/marionette/tests/unit/unit-tests.ini
@@ -119,16 +119,17 @@ b2g = false
 b2g = false
 
 [test_appcache.py]
 [test_screenshot.py]
 [test_cookies.py]
 b2g = false
 [test_window_title.py]
 [test_window_type.py]
+b2g = false
 [test_implicit_waits.py]
 [test_wait.py]
 [test_expected.py]
 [test_date_time_value.py]
 [test_getactiveframe_oop.py]
 disabled = "Bug 925688"
 b2g = false
 [test_submit.py]
@@ -147,8 +148,9 @@ skip-if = os == "linux" # Bug 1085717
 [test_with_using_context.py]
 
 [test_modal_dialogs.py]
 b2g = false
 [test_key_actions.py]
 [test_mouse_action.py]
 b2g = false
 [test_teardown_context_preserved.py]
+b2g = false