From 4f4c212a3e27d23ecb335355447f53f2955184ef Mon Sep 17 00:00:00 2001 From: "Nils Ohlmeier [:drno]" Date: Fri, 23 May 2014 11:28:00 +0200 Subject: [PATCH] Bug 1013809 - switch order of setLocalDescription and setRemoteDescription for the answer. r=jesup --- dom/media/tests/mochitest/mochitest.ini | 1 + dom/media/tests/mochitest/templates.js | 20 ++++++------- .../test_peerConnection_bug1013809.html | 30 +++++++++++++++++++ 3 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 dom/media/tests/mochitest/test_peerConnection_bug1013809.html diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini index 7cc39daf1a5a..219b1810ca42 100644 --- a/dom/media/tests/mochitest/mochitest.ini +++ b/dom/media/tests/mochitest/mochitest.ini @@ -60,6 +60,7 @@ skip-if = toolkit=='gonk' # b2g(Bug 960442, video support for WebRTC is disabled skip-if = toolkit=='gonk' # b2g(Bug 960442, video support for WebRTC is disabled on b2g) b2g-debug(Bug 960442, video support for WebRTC is disabled on b2g) [test_peerConnection_bug834153.html] [test_peerConnection_bug835370.html] +[test_peerConnection_bug1013809.html] [test_peerConnection_close.html] [test_peerConnection_errorCallbacks.html] [test_peerConnection_offerRequiresReceiveAudio.html] diff --git a/dom/media/tests/mochitest/templates.js b/dom/media/tests/mochitest/templates.js index a383721ab2f5..b827ff6902af 100644 --- a/dom/media/tests/mochitest/templates.js +++ b/dom/media/tests/mochitest/templates.js @@ -134,6 +134,16 @@ var commandsPeerConnection = [ }); } ], + [ + 'PC_REMOTE_SET_LOCAL_DESCRIPTION', + function (test) { + test.setLocalDescription(test.pcRemote, test.pcRemote._last_answer, STABLE, function () { + is(test.pcRemote.signalingState, STABLE, + "signalingState after remote setLocalDescription is 'stable'"); + test.next(); + }); + } + ], [ 'PC_LOCAL_GET_ANSWER', function (test) { @@ -161,16 +171,6 @@ var commandsPeerConnection = [ }); } ], - [ - 'PC_REMOTE_SET_LOCAL_DESCRIPTION', - function (test) { - test.setLocalDescription(test.pcRemote, test.pcRemote._last_answer, STABLE, function () { - is(test.pcRemote.signalingState, STABLE, - "signalingState after remote setLocalDescription is 'stable'"); - test.next(); - }); - } - ], [ 'PC_LOCAL_WAIT_FOR_ICE_CONNECTED', function (test) { diff --git a/dom/media/tests/mochitest/test_peerConnection_bug1013809.html b/dom/media/tests/mochitest/test_peerConnection_bug1013809.html new file mode 100644 index 000000000000..2ef8f98e2f07 --- /dev/null +++ b/dom/media/tests/mochitest/test_peerConnection_bug1013809.html @@ -0,0 +1,30 @@ + + + + + + + + + + + +
+
+
+ +