Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Bug 1525959 - Skip some mochitests tests under GeckoView r=geckoview-…
Browse files Browse the repository at this point in the history
…reviewers,esawin

There are few things that are either Fennec-specific or don't work
currently under GeckoView w/ e10s under TestRunnerActivity. Disable
these so we can get some testing going in automation.

This also replaces 'isFennec' with the more correct 'is_fennec'.

Differential Revision: https://phabricator.services.mozilla.com/D19016
  • Loading branch information
snorp committed Feb 27, 2019
1 parent 3b2d78c commit b30c588
Show file tree
Hide file tree
Showing 19 changed files with 27 additions and 12 deletions.
1 change: 1 addition & 0 deletions docshell/test/iframesandbox/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ support-files =
[test_child_navigation_by_location.html]
[test_marquee_event_handlers.html]
[test_other_auxiliary_navigation_by_location.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
tags = openwindow
[test_our_auxiliary_navigation_by_location.html]
tags = openwindow
Expand Down
1 change: 1 addition & 0 deletions dom/animation/test/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ skip-if = (toolkit == 'android' && debug) || (os == 'win' && bits == 64) # Bug 1
[mozilla/test_moz_prefixed_properties.html]
[mozilla/test_pending_animation_tracker.html]
[mozilla/test_restyles.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[mozilla/test_restyling_xhr_doc.html]
[mozilla/test_set_easing.html]
[mozilla/test_style_after_finished_on_compositor.html]
Expand Down
1 change: 1 addition & 0 deletions dom/base/test/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ skip-if = verify
[test_domparsing.html]
[test_domrequest.html]
[test_domwindowutils.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[test_element.matches.html]
[test_element_closest.html]
[test_elementTraversal.html]
Expand Down
2 changes: 1 addition & 1 deletion dom/html/test/forms/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ skip-if = android_version == '18' || os == 'mac'
[test_validation_not_in_doc.html]
[test_reportValidation_preventDefault.html]
[test_bug1495363.html]
skip-if = (webrender && os == "linux") # Bug 1520674
skip-if = (toolkit == 'android' && !is_fennec) || (webrender && os == "linux") # Bugs 1525959, 1520674
support-files =
file_bug1495363.html
file_bug1495363.sjs
Expand Down
2 changes: 2 additions & 0 deletions dom/html/test/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ skip-if = toolkit == 'android' #TIMED_OUT
[test_bug424698.html]
[test_bug428135.xhtml]
[test_bug430351.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[test_bug441930.html]
[test_bug442801.html]
[test_bug448166.html]
Expand Down Expand Up @@ -389,6 +390,7 @@ support-files =
[test_bug691.html]
[test_bug694.html]
[test_bug694503.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[test_bug696.html]
[test_bug717819.html]
[test_bug742030.html]
Expand Down
6 changes: 3 additions & 3 deletions dom/ipc/tests/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ skip-if = toolkit == 'cocoa' # cocoa: disabled due to hangs, see changeset 6852e
[test_CrashService_crash.html]
skip-if = !(crashreporter && !e10s && (toolkit == 'gtk3' || toolkit == 'cocoa' || toolkit == 'windows'))
[test_temporaryfile_stream.html]
skip-if = !e10s
skip-if = !e10s || toolkit == 'android' # Bug 1525959
support-files =
blob_verify.sjs
!/dom/canvas/test/captureStream_common.js
[test_Preallocated.html]
skip-if = !e10s
skip-if = !e10s || toolkit == 'android' # Bug 1525959
[test_force_oop_iframe.html]
skip-if = !e10s || webrender # oop-iframes trigger a debug assertion in webrender picture caching
skip-if = !e10s || webrender # oop-iframes trigger a debug assertion in webrender picture caching
support-files =
file_dummy.html
3 changes: 2 additions & 1 deletion dom/payments/test/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
prefs =
dom.payments.request.enabled=true
# skip-if !e10s will be removed once non-e10s is supported
skip-if = !e10s || !nightly_build
# Android crashes on nearly all tests, bug 1525959
skip-if = !e10s || !nightly_build || toolkit == 'android'
scheme = https
support-files =
blank_page.html
Expand Down
2 changes: 2 additions & 0 deletions dom/performance/tests/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ support-files =
[test_sharedWorker_performance_user_timing.html]
[test_worker_performance_now.html]
[test_timeOrigin.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[test_worker_performance_entries.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[test_performance_timing_json.html]
[test_performance_server_timing.html]
scheme = https
Expand Down
2 changes: 1 addition & 1 deletion dom/serviceworkers/test/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ tags = mcb
[test_onmessageerror.html]
[test_opaque_intercept.html]
[test_openWindow.html]
skip-if = toolkit == 'android' && !isFennec
skip-if = toolkit == 'android' && !is_fennec
tags = openwindow
[test_origin_after_redirect.html]
[test_origin_after_redirect_cached.html]
Expand Down
1 change: 1 addition & 0 deletions dom/tests/mochitest/bugs/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ skip-if = toolkit == 'android'
[test_bug440572.html]
[test_bug456151.html]
[test_bug458091.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[test_bug459848.html]
[test_bug465263.html]
[test_bug484775.html]
Expand Down
1 change: 1 addition & 0 deletions dom/tests/mochitest/fetch/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ prefs =
[test_headers_mainthread.html]
[test_fetch_basic.html]
[test_fetch_basic_sw_reroute.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[test_fetch_basic_sw_empty_reroute.html]
[test_fetch_basic_http.html]
[test_fetch_basic_http_sw_reroute.html]
Expand Down
1 change: 1 addition & 0 deletions dom/u2f/tests/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ scheme = http
[test_appid_facet_subdomain.html]
[test_multiple_keys.html]
[test_override_request.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1530681
4 changes: 3 additions & 1 deletion editor/libeditor/tests/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ subsuite = clipboard
[test_bug795418-6.html]
subsuite = clipboard
[test_bug795785.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[test_bug796839.html]
[test_bug830600.html]
subsuite = clipboard
Expand Down Expand Up @@ -262,7 +263,7 @@ skip-if = toolkit == 'android'

[test_abs_positioner_appearance.html]
[test_abs_positioner_positioning_elements.html]
skip-if = android_version == '18' # bug 1147989
skip-if = os == 'android' # Bug 1525959
[test_CF_HTML_clipboard.html]
subsuite = clipboard
[test_composition_event_created_in_chrome.html]
Expand Down Expand Up @@ -321,6 +322,7 @@ skip-if = toolkit == 'android'
[test_css_chrome_load_access.html]
skip-if = toolkit == 'android' # chrome urls not available due to packaging
[test_selection_move_commands.html]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[test_pasteImgTextarea.html]
skip-if = toolkit == 'android' # bug 1299578
[test_execCommandPaste_noTarget.html]
4 changes: 2 additions & 2 deletions gfx/layers/apz/test/mochitest/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
[test_group_mouseevents.html]
skip-if = (toolkit == 'android') # mouse events not supported on mobile
[test_group_pointerevents.html]
skip-if = os == 'win' && os_version == '10.0' # Bug 1404836
skip-if = (os == 'win' && os_version == '10.0') || (toolkit == 'android' && !is_fennec) # Bug 1404836, 1525959
[test_group_touchevents.html]
skip-if = (verify && debug && (os == 'win'))
[test_group_touchevents-2.html]
skip-if = (verify && debug && (os == 'win'))
[test_group_touchevents-3.html]
skip-if = (verify && debug && (os == 'win'))
skip-if = (verify && debug && (os == 'win')) || (toolkit == 'android' && !is_fennec) # Bug 1525959
[test_group_touchevents-4.html]
skip-if = (verify && debug && (os == 'win'))
[test_group_wheelevents.html]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ support-files =
file_slowed_document.sjs
head.js
tags = webextensions
skip-if = !isFennec
skip-if = !is_fennec

[test_ext_all_apis.html]
[test_ext_downloads_saveAs.html]
Expand Down
2 changes: 1 addition & 1 deletion testing/mochitest/runtestsremote.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def __init__(self, options):
"Android sdk version '%s'; will use this to filter manifests" %
str(self.device.version))
mozinfo.info['android_version'] = str(self.device.version)
mozinfo.info['isFennec'] = not ('geckoview' in options.app)
mozinfo.info['is_fennec'] = not ('geckoview' in options.app)
mozinfo.info['is_emulator'] = self.device._device_serial.startswith('emulator-')

def cleanup(self, options, final=False):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ support-files =
prefs =
security.mixed_content.upgrade_display_content=false
browser.chrome.guess_favicon=true
skip-if = toolkit == 'android' && !is_fennec

[test_ext_async_clipboard.html]
skip-if = (toolkit == 'android') # near-permafail after landing bug 1270059: Bug 1523131
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ support-files =
pwmgr_common.js
pwmgr_common_parent.js
../authenticate.sjs
skip-if = toolkit == 'android' && !isFennec # Don't run on GeckoView
skip-if = toolkit == 'android' && !is_fennec # Don't run on GeckoView

[test_autocomplete_highlight.html]
scheme = https
Expand Down
1 change: 1 addition & 0 deletions uriloader/exthandler/tests/mochitest/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ skip-if = (toolkit == 'android' || os == 'mac') || e10s # OS X: bug 786938
scheme = https
[test_unknown_ext_protocol_handlers.html]
[test_unsafeBidiChars.xhtml]
skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
[test_web_protocol_handlers.html]

0 comments on commit b30c588

Please sign in to comment.