Don't review, just testing draft
authorMartin Thomson <martin.thomson@gmail.com>
Mon, 24 Oct 2016 15:29:39 +1100
changeset 428524 bf49c915da1d62a250e554f15f0e09af3f9907ce
parent 428523 dcb1d15fed469292050dbdaab67c70d6953679ac
child 534746 42b0a1de11e8fcd2014c3df78a7b0b475a9be077
push id33323
push userbmo:martin.thomson@gmail.com
push dateMon, 24 Oct 2016 04:30:02 +0000
milestone52.0a1
Don't review, just testing MozReview-Commit-ID: BswetYYLBu0
dom/media/tests/mochitest/mochitest.ini
dom/media/tests/mochitest/test_peerConnection_certificates.html
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -132,17 +132,17 @@ skip-if = os == 'android' # bug 1043403
 [test_peerConnection_capturedVideo.html]
 tags=capturestream
 skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_captureStream_canvas_2d.html]
 skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_multiple_captureStream_canvas_2d.html]
 skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_captureStream_canvas_webgl.html]
-# [test_peerConnection_certificates.html] # bug 1180968
+[test_peerConnection_certificates.html]
 [test_peerConnection_close.html]
 [test_peerConnection_closeDuringIce.html]
 [test_peerConnection_constructedStream.html]
 skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_errorCallbacks.html]
 [test_peerConnection_iceFailure.html]
 skip-if = os == 'linux' || os == 'mac' || os == 'win' || android_version == '18' # (Bug 1180388 for win, mac and linux), android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_insertDTMF.html]
--- a/dom/media/tests/mochitest/test_peerConnection_certificates.html
+++ b/dom/media/tests/mochitest/test_peerConnection_certificates.html
@@ -99,28 +99,28 @@
 
   var test;
   runNetworkTest(function (options) {
     var expiredCert;
     return Promise.resolve()
       .then(() => RTCPeerConnection.generateCertificate({
         name: "ECDSA",
         namedCurve: "P-256",
-        expires: 1 // smallest possible expiration window
+        expires: 0 // smallest possible expiration window
       }))
       .then(cert => {
         ok(!isNaN(cert.expires), 'cert has expiration time');
         info('Expires at ' + new Date(cert.expires));
         expiredCert = cert;
       })
 
       .then(() => checkBadParameters())
 
       .then(() => {
-        var delay = expiredCert.expires - Date.now();
+        var delay = expiredCert.expires - Date.now() + 1;
         // Hopefully this delay is never needed.
         if (delay > 0) {
           return new Promise(r => setTimeout(r, delay));
         }
       })
       .then(() => {
         ok(expiredCert.expires <= Date.now(), 'Cert should be at or past expiration');
         try {