Bug 1013809 - switch order of setLocalDescription and setRemoteDescription for the answer. r=jib
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Sun, 01 Jun 2014 22:32:00 +0200
changeset 198713 1fa787bf69b94566b27b821d1997484e42f2c93f
parent 198712 fca1951dff5c8cee2cd4d6ec1ebf697f93c88e70
child 198714 98973c19e6408ce39986a0ef902a5a12449e3d7a
push id5990
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:40:24 +0000
treeherdermozilla-aurora@0796197efbc9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjib
bugs1013809
milestone32.0a1
Bug 1013809 - switch order of setLocalDescription and setRemoteDescription for the answer. r=jib
dom/media/tests/mochitest/templates.js
--- a/dom/media/tests/mochitest/templates.js
+++ b/dom/media/tests/mochitest/templates.js
@@ -130,16 +130,26 @@ var commandsPeerConnection = [
           send_message({"answer": test.pcRemote._last_answer,
                         "media_constraints": test.pcRemote.constraints});
         }
         test.next();
       });
     }
   ],
   [
+    '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) {
       if (test.pcRemote) {
         test._remote_answer = test.pcRemote._last_answer;
         test._remote_constraints = test.pcRemote.constraints;
         test.next();
       } else {
         wait_for_message().then(function(message) {
@@ -157,26 +167,16 @@ var commandsPeerConnection = [
       test.setRemoteDescription(test.pcLocal, test._remote_answer, STABLE, function () {
         is(test.pcLocal.signalingState, STABLE,
            "signalingState after local setRemoteDescription is 'stable'");
         test.next();
       });
     }
   ],
   [
-    '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) {
       var myTest = test;
       var myPc = myTest.pcLocal;
 
       function onIceConnectedSuccess () {
         ok(true, "pc_local: ICE switched to 'connected' state");
         myTest.next();