From 5e323ba22df219bd3a299507357a60102c21f709 Mon Sep 17 00:00:00 2001 From: Randell Jesup Date: Sun, 17 Feb 2013 13:54:05 -0500 Subject: [PATCH] Bug 826044: Fix Webrtc crashtests, disable known permaoranges r=jsmith --- dom/media/tests/crashtests/799419.html | 12 +++++++++--- dom/media/tests/crashtests/802982.html | 11 ++++++++--- dom/media/tests/crashtests/812785.html | 2 +- dom/media/tests/crashtests/834100.html | 7 ++++--- dom/media/tests/crashtests/837324.html | 14 ++++++++++---- dom/media/tests/crashtests/837421.html | 15 ++++++++++----- dom/media/tests/crashtests/crashtests.list | 6 ++---- 7 files changed, 44 insertions(+), 23 deletions(-) diff --git a/dom/media/tests/crashtests/799419.html b/dom/media/tests/crashtests/799419.html index 440d77a58ce..a59739dd56f 100644 --- a/dom/media/tests/crashtests/799419.html +++ b/dom/media/tests/crashtests/799419.html @@ -1,5 +1,5 @@ - - + + @@ -7,6 +7,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=799419 2 Peer Connections Create and Close + Fake Video - + diff --git a/dom/media/tests/crashtests/802982.html b/dom/media/tests/crashtests/802982.html index 28b7abdb458..6047a391c39 100644 --- a/dom/media/tests/crashtests/802982.html +++ b/dom/media/tests/crashtests/802982.html @@ -1,5 +1,5 @@ - - + + @@ -8,15 +8,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=802982 Excessive getUserMedia calls - + diff --git a/dom/media/tests/crashtests/812785.html b/dom/media/tests/crashtests/812785.html index ef58c52e21c..a0d2da317fd 100644 --- a/dom/media/tests/crashtests/812785.html +++ b/dom/media/tests/crashtests/812785.html @@ -62,7 +62,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=812785 - + diff --git a/dom/media/tests/crashtests/834100.html b/dom/media/tests/crashtests/834100.html index 08ea2ff8fee..ce6dd6adc9b 100644 --- a/dom/media/tests/crashtests/834100.html +++ b/dom/media/tests/crashtests/834100.html @@ -10,8 +10,9 @@ function start() { sdbMid: "helloworld", // Mis-spelt attribute for bug 833948 compatibility. sdpMLineIndex: 1 }); - remotePC.addIceCandidate(cand); - remotePC.addIceCandidate(cand, function(sdp){}, finish); + try {remotePC.addIceCandidate(cand);} catch(e) {} // bug 842075 - remove try when fixed + try {remotePC.addIceCandidate(cand, function(sdp){}, finish);} catch(e) {} // bug 842075 - remove try when fixed + finish(); } function finish(arg) { @@ -19,6 +20,6 @@ function finish(arg) { } - + diff --git a/dom/media/tests/crashtests/837324.html b/dom/media/tests/crashtests/837324.html index ab19ffabb42..3c83452063c 100644 --- a/dom/media/tests/crashtests/837324.html +++ b/dom/media/tests/crashtests/837324.html @@ -1,5 +1,5 @@ - - + + @@ -7,13 +7,19 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=837324 Bug 837324 - + diff --git a/dom/media/tests/crashtests/837421.html b/dom/media/tests/crashtests/837421.html index e57450c8512..78f2c9abd58 100644 --- a/dom/media/tests/crashtests/837421.html +++ b/dom/media/tests/crashtests/837421.html @@ -1,5 +1,5 @@ - - + + @@ -7,23 +7,28 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=837421 Bug 837421 - + diff --git a/dom/media/tests/crashtests/crashtests.list b/dom/media/tests/crashtests/crashtests.list index cd486e03c16..d77960e2053 100644 --- a/dom/media/tests/crashtests/crashtests.list +++ b/dom/media/tests/crashtests/crashtests.list @@ -1,14 +1,12 @@ -default-preferences pref(media.peerconnection.enabled,true) +default-preferences pref(media.peerconnection.enabled,true) pref(media.navigator.permission.disabled,true) load 780790.html -load 791270.html +asserts(0-2) load 791270.html # bug 839647 load 791278.html load 791330.html load 799419.html -load 801227.html load 802982.html load 812785.html -load 822197.html load 834100.html load 837324.html load 837421.html