From 47f4c14c67f129da706bd73b42242a7fa6eff125 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Sat, 5 Nov 2016 11:29:21 +0100 Subject: [PATCH] Bug 1310297 - Remove test annotations using b2g, mulet or gonk: security. r=RyanVM MozReview-Commit-ID: 5BWcsGaJEuH --HG-- extra : rebase_source : 823fea660d09c02019c8383f22c3bf3a3f1a204f --- .../mochitest/mixedcontent/mochitest.ini | 2 +- .../stricttransportsecurity/chrome.ini | 2 +- .../stricttransportsecurity/mochitest.ini | 1 - .../ssl/tests/unit/xpcshell-smartcards.ini | 2 +- security/manager/ssl/tests/unit/xpcshell.ini | 25 +++++-------------- 5 files changed, 9 insertions(+), 23 deletions(-) diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini b/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini index 7e1adb6336ae..c7a352eb8453 100644 --- a/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini +++ b/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT +skip-if = toolkit == 'android' #TIMED_OUT support-files = alloworigin.sjs backward.html diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini b/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini index f321a44cd2f2..b2ce8fef00b5 100644 --- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini +++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini @@ -1,6 +1,6 @@ [DEFAULT] tags = psm -skip-if = buildapp == 'b2g' || os == 'android' +skip-if = os == 'android' support-files = page_blank.html [test_sts_privatebrowsing_perwindowpb.html] diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini b/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini index 1df2585ca74f..100f45840d94 100644 --- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini +++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini @@ -1,6 +1,5 @@ [DEFAULT] tags = psm -skip-if = buildapp == 'b2g' support-files = nosts_bootstrap.html nosts_bootstrap.html^headers^ diff --git a/security/manager/ssl/tests/unit/xpcshell-smartcards.ini b/security/manager/ssl/tests/unit/xpcshell-smartcards.ini index e26b2048a0d8..df099b7469d9 100644 --- a/security/manager/ssl/tests/unit/xpcshell-smartcards.ini +++ b/security/manager/ssl/tests/unit/xpcshell-smartcards.ini @@ -2,7 +2,7 @@ head = head_psm.js tail = tags = psm -skip-if = toolkit == 'android' || toolkit == 'gonk' +skip-if = toolkit == 'android' support-files = [test_pkcs11_insert_remove.js] diff --git a/security/manager/ssl/tests/unit/xpcshell.ini b/security/manager/ssl/tests/unit/xpcshell.ini index f2f239444d17..a84450301ebc 100644 --- a/security/manager/ssl/tests/unit/xpcshell.ini +++ b/security/manager/ssl/tests/unit/xpcshell.ini @@ -35,7 +35,6 @@ support-files = [test_add_preexisting_cert.js] [test_baseline_requirements_subject_common_name.js] [test_cert_blocklist.js] -skip-if = buildapp == "b2g" tags = addons psm [test_cert_chains.js] run-sequentially = hardcoded ports @@ -55,7 +54,7 @@ run-sequentially = hardcoded ports [test_certDB_import.js] [test_certDB_import_pkcs12.js] [test_certviewer_invalid_oids.js] -skip-if = toolkit == 'android' || buildapp == 'b2g' +skip-if = toolkit == 'android' [test_constructX509FromBase64.js] [test_content_signing.js] [test_datasignatureverifier.js] @@ -65,21 +64,18 @@ skip-if = os != 'win' # tests a Windows-specific feature [test_ev_certs.js] run-sequentially = hardcoded ports [test_forget_about_site_security_headers.js] -skip-if = toolkit == 'android' || toolkit == 'gonk' +skip-if = toolkit == 'android' [test_getchain.js] [test_hash_algorithms.js] [test_hash_algorithms_wrap.js] -# bug 1124289 - run_test_in_child violates the sandbox on b2g and android -skip-if = toolkit == 'android' || toolkit == 'gonk' +# bug 1124289 - run_test_in_child violates the sandbox on android +skip-if = toolkit == 'android' [test_hmac.js] [test_intermediate_basic_usage_constraints.js] [test_js_cert_override_service.js] run-sequentially = hardcoded ports [test_keysize.js] [test_keysize_ev.js] -# OCSP requests in this test time out on slow B2G Emulator debug builds. -# See Bug 1147726. -skip-if = toolkit == 'gonk' && debug run-sequentially = hardcoded ports [test_local_cert.js] [test_logoutAndTeardown.js] @@ -95,9 +91,6 @@ run-sequentially = hardcoded ports [test_ocsp_enabled_pref.js] run-sequentially = hardcoded ports [test_ocsp_fetch_method.js] -# OCSP requests in this test time out on slow B2G Emulator debug builds. -# See Bug 1147725. -skip-if = toolkit == 'gonk' && debug run-sequentially = hardcoded ports [test_ocsp_must_staple.js] run-sequentially = hardcoded ports @@ -109,17 +102,11 @@ run-sequentially = hardcoded ports run-sequentially = hardcoded ports [test_ocsp_stapling_expired.js] run-sequentially = hardcoded ports -skip-if = (toolkit == 'gonk' && debug) # Bug 1029775 [test_ocsp_stapling_with_intermediate.js] run-sequentially = hardcoded ports [test_ocsp_timeout.js] run-sequentially = hardcoded ports [test_ocsp_url.js] -# OCSP requests in this test time out on slow B2G Emulator debug builds. -# See Bug 1147725. -# This test also fails on B2G Emulator opt builds non-reproducibly. -# See Bug 1178988. -skip-if = toolkit == 'gonk' run-sequentially = hardcoded ports [test_password_prompt.js] [test_pinning.js] @@ -138,8 +125,8 @@ tags = addons psm [test_sss_readstate.js] [test_sss_readstate_child.js] support-files = sss_readstate_child_worker.js -# bug 1124289 - run_test_in_child violates the sandbox on b2g and android -skip-if = toolkit == 'android' || toolkit == 'gonk' +# bug 1124289 - run_test_in_child violates the sandbox on android +skip-if = toolkit == 'android' [test_sss_readstate_empty.js] [test_sss_readstate_garbage.js] [test_sss_readstate_huge.js]