From 235bcddf5a63b4751a6df9c84eef702254d700d1 Mon Sep 17 00:00:00 2001 From: WPT Sync Bot Date: Sun, 11 Mar 2018 21:09:20 -0400 Subject: [PATCH] Update web-platform-tests to revision 9c9d8f24b19b9a8b432c76db4ade468be8a50250 --- tests/wpt/metadata/MANIFEST.json | 2 +- .../webrtc/RTCDTMFSender-helper.js | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 0e8b8471613..78f0fb33d5b 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -601473,7 +601473,7 @@ "testharness" ], "webrtc/RTCDTMFSender-helper.js": [ - "79825a416ad8e027628e80c9e0ef1a8dca2d8ca3", + "26b5336881897c93fafd1ddf32910cf6fef16987", "support" ], "webrtc/RTCDTMFSender-insertDTMF.https.html": [ diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-helper.js b/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-helper.js index 23c01d9f756..70fc6917225 100644 --- a/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-helper.js +++ b/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-helper.js @@ -14,7 +14,7 @@ // Connect the PeerConnection to another PC and wait until it is // properly connected, so that DTMF can be sent. function createDtmfSender(pc = new RTCPeerConnection()) { - var dtmfSender; + let dtmfSender; return getTrackFromUserMedia('audio') .then(([track, mediaStream]) => { const sender = pc.addTrack(track, mediaStream); @@ -28,6 +28,9 @@ function createDtmfSender(pc = new RTCPeerConnection()) { exchangeIceCandidates(pc, pc2); return doSignalingHandshake(pc, pc2); }).then(() => { + if (!('canInsertDTMF' in dtmfSender)) { + return Promise.resolve(); + } // Wait until dtmfSender.canInsertDTMF becomes true. // Up to 150 ms has been observed in test. Wait 1 second // in steps of 10 ms. @@ -35,7 +38,7 @@ function createDtmfSender(pc = new RTCPeerConnection()) { // make test return a clear error message on failure. return new Promise((resolve, reject) => { let counter = 0; - let checkfunc = function() { + step_timeout(function checkCanInsertDTMF() { if (dtmfSender.canInsertDTMF) { resolve(); } else { @@ -44,14 +47,11 @@ function createDtmfSender(pc = new RTCPeerConnection()) { return; } ++counter; - step_timeout(checkfunc, 10); + step_timeout(checkCanInsertDTMF, 10); } - }; - checkfunc(); + }, 0); }); }).then(() => { - assert_true(dtmfSender.canInsertDTMF, - 'Failed to create usable dtmfSender:'); return dtmfSender; }); }