Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/security. r?RyanVM
MozReview-Commit-ID: 8G41CCQ1P01
--- a/dom/security/test/csp/mochitest.ini
+++ b/dom/security/test/csp/mochitest.ini
@@ -187,78 +187,67 @@ support-files =
file_data-uri_blocked.html
file_data-uri_blocked.html^headers^
[test_base-uri.html]
[test_blob_data_schemes.html]
[test_connect-src.html]
[test_CSP.html]
[test_allow_https_schemes.html]
-skip-if = buildapp == 'b2g' #no ssl support
[test_bug663567.html]
[test_bug802872.html]
[test_bug885433.html]
[test_bug888172.html]
[test_evalscript.html]
[test_frameancestors.html]
-skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' # Times out, not sure why (bug 1008445)
+skip-if = toolkit == 'android' # Times out, not sure why (bug 1008445)
[test_inlinescript.html]
[test_inlinestyle.html]
[test_invalid_source_expression.html]
[test_bug836922_npolicies.html]
[test_bug886164.html]
[test_redirects.html]
[test_bug910139.html]
[test_bug909029.html]
[test_bug1229639.html]
[test_policyuri_regression_from_multipolicy.html]
[test_nonce_source.html]
[test_bug941404.html]
[test_form-action.html]
-skip-if = buildapp == 'b2g' # http-on-opening-request observers are not available in child processes
[test_hash_source.html]
-skip-if = buildapp == 'b2g' # can't compute hashes in child process (bug 958702)
[test_scheme_relative_sources.html]
-skip-if = buildapp == 'b2g' #no ssl support
[test_ignore_unsafe_inline.html]
[test_self_none_as_hostname_confusion.html]
[test_path_matching.html]
[test_path_matching_redirect.html]
[test_report_uri_missing_in_report_only_header.html]
[test_report.html]
[test_301_redirect.html]
-skip-if = buildapp == 'b2g' # intermittent orange (bug 1028490)
[test_302_redirect.html]
-skip-if = buildapp == 'b2g' # intermittent orange (bug 1028490)
[test_303_redirect.html]
-skip-if = buildapp == 'b2g' # intermittent orange (bug 1028490)
[test_307_redirect.html]
-skip-if = buildapp == 'b2g' # intermittent orange (bug 1028490)
[test_subframe_run_js_if_allowed.html]
[test_leading_wildcard.html]
[test_multi_policy_injection_bypass.html]
[test_null_baseuri.html]
[test_referrerdirective.html]
-skip-if = buildapp == 'b2g' #no ssl support
[test_dual_header.html]
[test_upgrade_insecure.html]
# no ssl support as well as websocket tests do not work (see test_websocket.html)
-skip-if = buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'gonk' || toolkit == 'android'
+skip-if = toolkit == 'android'
[test_upgrade_insecure_reporting.html]
-skip-if = buildapp == 'b2g' || toolkit == 'gonk' || toolkit == 'android'
+skip-if = toolkit == 'android'
[test_upgrade_insecure_referrer.html]
-skip-if = buildapp == 'b2g' || toolkit == 'gonk' || toolkit == 'android'
+skip-if = toolkit == 'android'
[test_upgrade_insecure_cors.html]
-skip-if = buildapp == 'b2g' || toolkit == 'gonk' || toolkit == 'android'
+skip-if = toolkit == 'android'
[test_report_for_import.html]
[test_blocked_uri_in_reports.html]
[test_service_worker.html]
-skip-if = buildapp == 'b2g' #no ssl support
[test_child-src_worker.html]
-skip-if = buildapp == 'b2g' #investigate in bug 1222904
[test_shouldprocess.html]
# Fennec platform does not support Java applet plugin
skip-if = toolkit == 'android' #investigate in bug 1250814
[test_child-src_worker_data.html]
[test_child-src_worker-redirect.html]
[test_child-src_iframe.html]
[test_meta_element.html]
[test_meta_header_dual.html]
--- a/dom/security/test/mixedcontentblocker/mochitest.ini
+++ b/dom/security/test/mixedcontentblocker/mochitest.ini
@@ -11,13 +11,13 @@ support-files =
file_main.html
file_main_bug803225.html
file_main_bug803225_websocket_wsh.py
file_server.sjs
!/dom/media/test/320x240.ogv
!/image/test/mochitest/blue.png
[test_main.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT, SSL_REQUIRED # Bug 1141029 Mulet parity with B2G Desktop for TC
+skip-if = toolkit == 'android' #TIMED_OUT
[test_bug803225.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT, SSL_REQUIRED # Bug 1141029 Mulet parity with B2G Desktop for TC
+skip-if = toolkit == 'android' #TIMED_OUT
[test_frameNavigation.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT, SSL_REQUIRED
+skip-if = toolkit == 'android' #TIMED_OUT
--- a/dom/security/test/unit/xpcshell.ini
+++ b/dom/security/test/unit/xpcshell.ini
@@ -1,9 +1,7 @@
[DEFAULT]
head =
tail =
-skip-if = toolkit == 'gonk'
[test_csp_reports.js]
-skip-if = buildapp == 'mulet'
[test_isOriginPotentiallyTrustworthy.js]
[test_csp_upgrade_insecure_request_header.js]