1 files changed, 42 insertions, 37 deletions

diff --git a/dom/media/webrtc/tests/mochitests/test_peerConnection_bug825703.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_bug825703.html
index 5cd168af8a..5efb4a17d2 100644
--- a/dom/media/webrtc/tests/mochitests/test_peerConnection_bug825703.html
+++ b/dom/media/webrtc/tests/mochitests/test_peerConnection_bug825703.html
@@ -25,7 +25,7 @@ var makePC = (config, expected_error) => {
     exception = e;
   }
   is((exception? exception.name : "success"), expected_error || "success",
-     "RTCPeerConnection(" + JSON.stringify(config) + ")");
+     "RTCPeerConnection(" + JSON.stringify(config) + ") " + exception?.message);
 };
 
 // The order of properties in objects is not guaranteed in JavaScript, so this
@@ -39,8 +39,8 @@ var toComparable = o =>
 }, {});
 
 // This is a test of the iceServers parsing code + readable errors
-runNetworkTest(() => {
-  var exception = null;
+runNetworkTest(async () => {
+  let exception = null;
 
   try {
     new RTCPeerConnection().close();
@@ -56,26 +56,37 @@ runNetworkTest(() => {
     { urls:"stun:127.0.0.1" },
     { urls:"stun:localhost", foo:"" },
     { urls: ["stun:127.0.0.1", "stun:localhost"] },
-    { urls:"stuns:localhost", foo:"" },
+  ]});
+  makePC({ iceServers: [
     { urls:"turn:[::1]:3478", username:"p", credential:"p" },
     { urls:"turn:[::1]:3478", username:"", credential:"" },
     { urls:"turns:[::1]:3478", username:"", credential:"" },
+  ]});
+  makePC({ iceServers: [
     { urls:"turn:localhost:3478?transport=udp", username:"p", credential:"p" },
     { urls: ["turn:[::1]:3478", "turn:localhost"], username:"p", credential:"p" },
     { urls:"turns:localhost:3478?transport=udp", username:"p", credential:"p" },
-    { url:"stun:localhost", foo:"" },
-    { url:"turn:localhost", username:"p", credential:"p" }
   ]});
-
   makePC({ iceServers: [{ urls:"http:0.0.0.0" }] }, "SyntaxError");
 
   try {
-    new RTCPeerConnection({ iceServers: [{ url:"http:0.0.0.0" }] }).close();
+    new RTCPeerConnection({ iceServers: [{ urls:"http:0.0.0.0" }] }).close();
   } catch (e) {
     ok(e.message.indexOf("http") > 0,
        "RTCPeerConnection() constructor has readable exceptions");
   }
 
+  const push = prefs => SpecialPowers.pushPrefEnv(prefs);
+
+  // Remaining tests trigger warnings
+  await push({ set: [['media.peerconnection.treat_warnings_as_errors', false]] });
+
+  makePC({ iceServers: [
+    { urls:"stuns:localhost", foo:"" },
+    { url:"stun:localhost", foo:"" },
+    { url:"turn:localhost", username:"p", credential:"p" }
+  ]});
+
   // Test getConfiguration
   const config = {
     bundlePolicy: "max-bundle",
@@ -98,41 +109,35 @@ runNetworkTest(() => {
      JSON.stringify(toComparable(config)), "getConfiguration");
   pc.close();
 
-  var push = prefs => SpecialPowers.pushPrefEnv(prefs);
-
-  return Promise.resolve()
   // This set of tests are setting the about:config User preferences for default
   // ice servers and checking the outputs when RTCPeerConnection() is
   // invoked. See Bug 1167922 for more information.
-  .then(() => push({ set: [['media.peerconnection.default_iceservers', ""]] })
-    .then(() => makePC())
-    .then(() => push({ set: [['media.peerconnection.default_iceservers', "k"]] }))
-    .then(() => makePC())
-    .then(() => push({ set: [['media.peerconnection.default_iceservers', "[{\"urls\": [\"stun:stun.services.mozilla.com\"]}]"]] }))
-    .then(() => makePC()))
+  await push({ set: [['media.peerconnection.default_iceservers', ""]] });
+  makePC();
+  await push({ set: [['media.peerconnection.default_iceservers', "k"]] });
+  makePC();
+  await push({ set: [['media.peerconnection.default_iceservers',
+                      "[{\"urls\": [\"stun:stun.services.mozilla.com\"]}]"]]});
+  makePC();
   // This set of tests check that warnings work. See Bug 1254839 for more.
-  .then(() => {
-    let promise = new Promise(resolve => {
-      SpecialPowers.registerConsoleListener(msg => {
-        if (msg.message.includes("onaddstream")) {
-          SpecialPowers.postConsoleSentinel();
-          resolve(msg.message);
-        }
-      });
+  const warning = await new Promise(resolve => {
+    SpecialPowers.registerConsoleListener(msg => {
+      if (msg.message.includes("onaddstream")) {
+        SpecialPowers.postConsoleSentinel();
+        resolve(msg.message);
+      }
     });
     lineNumberAndFunction.func();
-    return promise;
-  }).then(warning => {
-    is(warning.split('"')[1],
-       "WebRTC: onaddstream is deprecated! Use peerConnection.ontrack instead.",
-       "warning logged");
-    var remainder = warning.split('"').slice(2).join('"');
-    info(remainder);
-    ok(remainder.includes('file: "' + window.location + '"'),
-       "warning has this file");
-    ok(remainder.includes('line: ' + lineNumberAndFunction.line),
-       "warning has correct line number");
-    });
+  });
+  is(warning.split('"')[1],
+     "WebRTC: onaddstream is deprecated! Use peerConnection.ontrack instead.",
+     "warning logged");
+  const remainder = warning.split('"').slice(2).join('"');
+  info(remainder);
+  ok(remainder.includes('file: "' + window.location + '"'),
+     "warning has this file");
+  ok(remainder.includes('line: ' + lineNumberAndFunction.line),
+     "warning has correct line number");
 });
 </script>
 </pre>