From 16659fa89876fc4a528d3f6480b870a6517bce3a Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Fri, 7 Feb 2014 16:01:21 -0800 Subject: [PATCH] Backed out changeset 9add9f9ed1fd (bug 950266) for m3 failures to help clean up this CLOSED TREE --- dom/media/tests/mochitest/mochitest.ini | 2 -- testing/mochitest/b2g-debug.json | 5 ----- testing/mochitest/b2g.json | 4 ---- 3 files changed, 11 deletions(-) diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini index 26e5cff49fa..0b3e3df0ae9 100644 --- a/dom/media/tests/mochitest/mochitest.ini +++ b/dom/media/tests/mochitest/mochitest.ini @@ -37,11 +37,9 @@ skip-if = os == 'mac' [test_peerConnection_basicAudioVideoCombined.html] [test_peerConnection_basicVideo.html] [test_peerConnection_bug822674.html] -[test_peerConnection_bug825703.html] [test_peerConnection_bug827843.html] [test_peerConnection_bug834153.html] [test_peerConnection_bug835370.html] -[test_peerConnection_errorCallbacks.html] [test_peerConnection_offerRequiresReceiveAudio.html] [test_peerConnection_offerRequiresReceiveVideo.html] [test_peerConnection_offerRequiresReceiveVideoAudio.html] diff --git a/testing/mochitest/b2g-debug.json b/testing/mochitest/b2g-debug.json index 22b9da9ae28..6b0d0b6e7ac 100644 --- a/testing/mochitest/b2g-debug.json +++ b/testing/mochitest/b2g-debug.json @@ -315,11 +315,6 @@ "dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideo.html":"Bug 960442, video support for WebRTC is disabled on b2g", "dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideoAudio.html":"Bug 960442, video support for WebRTC is disabled on b2g", "dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html":"Bug 960442, video support for WebRTC is disabled on b2g", - - "dom/media/tests/mochitest/test_peerConnection_bug825703.html":"Bug 950266, test is perma-fail with Nuwa enabled", - "dom/media/tests/mochitest/test_peerConnection_errorCallbacks.html":"Bug 950266, test is perma-fail with Nuwa enabled", - - "dom/media/tests/ipc/test_ipc.html":"nested ipc not working", "dom/network/tests/test_networkstats_basics.html":"Will be fixed in bug 858005", diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json index 21de8bf270a..95f3496e261 100644 --- a/testing/mochitest/b2g.json +++ b/testing/mochitest/b2g.json @@ -301,10 +301,6 @@ "dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideo.html":"Bug 960442, video support for WebRTC is disabled on b2g", "dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideoAudio.html":"Bug 960442, video support for WebRTC is disabled on b2g", "dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html":"Bug 960442, video support for WebRTC is disabled on b2g", - - "dom/media/tests/mochitest/test_peerConnection_bug825703.html":"Bug 950266, test is perma-fail with Nuwa enabled", - "dom/media/tests/mochitest/test_peerConnection_errorCallbacks.html":"Bug 950266, test is perma-fail with Nuwa enabled", - "dom/media/tests/ipc/test_ipc.html":"nested ipc not working", "dom/permission/tests/test_permission_basics.html":"https not working, bug 907770",