Bug 1103336 - Fix and re-enable PSM xpcshell tests that don't use add_tls_server_setup() on Android. r=dkeeler

security/manager/ssl/tests/unit/test_ocsp_fetch_method.js

@@ -13,7 +13,7 @@ do_get_profile(); // must be called before getting nsIX509CertDB
 const certdb = Cc["@mozilla.org/security/x509certdb;1"]
                  .getService(Ci.nsIX509CertDB);
 
-const SERVER_PORT = 8080;
+const SERVER_PORT = 8888;
 
 function start_ocsp_responder(expectedCertNames, expectedPaths,
                               expectedMethods) {

security/manager/ssl/tests/unit/test_ocsp_fetch_method/generate.py

@@ -22,7 +22,7 @@ def generate_certs():
     [noise_file, pwd_file] = CertUtils.init_nss_db(srcdir)
     generate_ca_cert(srcdir, srcdir, noise_file, 'ca')
     generate_child_cert(srcdir, srcdir, noise_file, 'int', 'ca', False, '')
-    ocsp_url = "http://www.example.com:8080/"
+    ocsp_url = "http://www.example.com:8888/"
     generate_child_cert(srcdir, srcdir, noise_file, "a", 'int', True, ocsp_url)
     generate_child_cert(srcdir, srcdir, noise_file, "b", 'int', True, ocsp_url)
 

security/manager/ssl/tests/unit/xpcshell.ini

@@ -91,12 +91,8 @@ run-sequentially = hardcoded ports
 skip-if = os == "android"
 [test_ocsp_url.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_ocsp_fetch_method.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_ocsp_no_hsts_upgrade.js]
 run-sequentially = hardcoded ports
 # Bug 1009158: this test times out on Android
@@ -105,9 +101,8 @@ skip-if = os == "android"
 [test_keysize.js]
 [test_keysize_ev.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
 # Bug 1008316: B2G doesn't have EV enabled
-skip-if = os == "android" || buildapp == "b2g"
+skip-if = buildapp == "b2g"
 [test_cert_chains.js]
 run-sequentially = hardcoded ports
 # Bug 1009158: this test times out on Android