Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 03d5eb3c540b (bug 1284874)

Browse Source
This commit is contained in:
Sebastian Hengst 2016-08-23 18:54:42 +02:00
parent a5a1f4b822
commit a4da88e857
5 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testing/marionette/harness/marionette/runner/base.py
View File

@ -989,7 +989,6 @@ setReq.onerror = function() {
filters.append(tags(self.test_tags))
json_path = update_mozinfo(filepath)
self.logger.info("mozinfo updated with the following: {}".format(None))
self.logger.info("mozinfo is: {}".format(mozinfo.info))
manifest_tests = manifest.active_tests(exists=False,
disabled=True,
filters=filters,

3
testing/marionette/harness/marionette/tests/unit/test_elementsize.py
View File

@ -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 import MarionetteTestCase, skip_if_mobile
from marionette import MarionetteTestCase
from marionette_driver.by import By
@ -16,7 +16,6 @@ class TestElementSize(MarionetteTestCase):
self.assertTrue(size['height'] > 0)
@skip_if_mobile
class TestElementSizeChrome(MarionetteTestCase):
def setUp(self):
MarionetteTestCase.setUp(self)

3
testing/marionette/harness/marionette/tests/unit/test_pagesource.py
View File

@ -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 import MarionetteTestCase, skip_if_mobile
from marionette import MarionetteTestCase
class TestPageSource(MarionetteTestCase):
@ -27,7 +27,6 @@ class TestPageSource(MarionetteTestCase):
self.assertEqual(re.sub("\s", "", source), "<xml><foo><bar>baz</bar></foo></xml>")
@skip_if_mobile
class TestPageSourceChrome(MarionetteTestCase):
def setUp(self):
MarionetteTestCase.setUp(self)

3
testing/marionette/harness/marionette/tests/unit/test_window_title.py
View File

@ -2,9 +2,8 @@
# 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, skip_if_mobile
from marionette import MarionetteTestCase
@skip_if_mobile
class TestTitleChrome(MarionetteTestCase):
def setUp(self):
MarionetteTestCase.setUp(self)

38
testing/marionette/harness/marionette/tests/unit/unit-tests.ini
View File

@ -12,18 +12,18 @@ expected = fail
skip-if = buildapp == 'b2g'
[test_click.py]
[test_click_chrome.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_checkbox.py]
[test_checkbox_chrome.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_elementsize.py]
[test_position.py]
[test_rendered_element.py]
[test_chrome_element_css.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_element_state.py]
[test_element_state_chrome.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_text.py]
[test_text_chrome.py]
skip-if = true # "Bug 896046"
@ -41,7 +41,7 @@ skip-if = buildapp == 'b2g' || (e10s && os == 'win')
[test_simpletest_fail.js]
[test_element_retrieval.py]
[test_findelement_chrome.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_navigation.py]
@ -56,7 +56,7 @@ skip-if = true # buildapp != 'b2g' -- Bug 1060060
[test_single_finger.py]
skip-if = true # buildapp != 'b2g' -- Bug 1060060
[test_single_finger_desktop.py]
skip-if = buildapp == 'b2g' || appname == 'fennec' || os == "win" # Bug 1025040
skip-if = buildapp == 'b2g' || os == "win" # Bug 1025040
[test_multi_finger.py]
skip-if = true # buildapp != 'b2g' -- Bug 1060060
@ -66,33 +66,33 @@ skip-if = true # buildapp != 'b2g' -- Bug 1060060
[test_simpletest_chrome.js]
[test_simpletest_timeout.js]
[test_anonymous_content.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_switch_frame.py]
skip-if = buildapp == 'b2g' || os == "win" # Bug 1078237
[test_switch_frame_chrome.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_switch_remote_frame.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_pagesource.py]
skip-if = buildapp == 'b2g'
[test_visibility.py]
[test_window_switching.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_window_management.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_window_position.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_window_handles.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_screenshot.py]
[test_cookies.py]
skip-if = buildapp == 'b2g'
[test_window_title.py]
[test_window_type.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_implicit_waits.py]
[test_wait.py]
[test_expected.py]
@ -108,18 +108,18 @@ skip-if = true # buildapp == 'b2g' -- Bug 925688
[test_profile_management.py]
skip-if = buildapp == 'b2g'
[test_set_window_size.py]
skip-if = buildapp == 'b2g' || os == "linux" || appname == 'fennec' # Bug 1085717
skip-if = buildapp == 'b2g' || os == "linux" # Bug 1085717
[test_with_using_context.py]
[test_modal_dialogs.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_key_actions.py]
[test_mouse_action.py]
skip-if = buildapp == 'b2g' || (os == "win" && !debug && os_version == "6.1") || appname == 'fennec'# Bug 1273758
skip-if = buildapp == 'b2g' || (os == "win" && !debug && os_version == "6.1") # Bug 1273758
[test_teardown_context_preserved.py]
skip-if = buildapp == 'b2g'
[test_file_upload.py]
skip-if = buildapp == 'b2g' || appname == 'fennec' || os == "win" # http://bugs.python.org/issue14574
skip-if = buildapp == 'b2g' || os == "win" # http://bugs.python.org/issue14574
[test_execute_sandboxes.py]
[test_using_permissions.py]
@ -128,7 +128,7 @@ skip-if = buildapp == 'b2g' || appname == 'fennec' || os == "win" # http://bugs.
[test_shadow_dom.py]
[test_chrome.py]
skip-if = buildapp == 'b2g' || appname == 'fennec'
skip-if = buildapp == 'b2g'
[test_addons.py]