commit 83eb7dff5ca37c35ed096ce3ab7b70db2610335a
author fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jun 03 16:38:08 2014 +0000
committer fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jun 03 16:38:08 2014 +0000
tree ce7650ffab2d3f7efd2e6649fffddd605d1983ca
parent ddc6bc9347e0abc84fe5bf346ba8377964594aec

PeerConnection(java): disable wait for flaky ICEConnection.COMPLETED.

This should be reverted when COMPLETED is delivered reliably.

BUG=3021
TESTED=without this patch the test fails in Debug mode after a handful of runs.  With this patch 100 runs passed in a row on my desktop.
R=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/13569004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6315 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java

diff --git a/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java b/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java
index fddb503..b171b58 100644
--- a/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java
+++ b/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java
@@ -175,6 +175,12 @@
     @Override
     public synchronized void onIceConnectionChange(
         IceConnectionState newState) {
+      // TODO(bemasc): remove once delivery of ICECompleted is reliable
+      // (https://code.google.com/p/webrtc/issues/detail?id=3021).
+      if (newState.equals(IceConnectionState.COMPLETED)) {
+        return;
+      }
+
       assertEquals(expectedIceConnectionChanges.removeFirst(), newState);
     }
 
@@ -646,8 +652,11 @@
         IceConnectionState.CHECKING);
     offeringExpectations.expectIceConnectionChange(
         IceConnectionState.CONNECTED);
-    offeringExpectations.expectIceConnectionChange(
-        IceConnectionState.COMPLETED);
+    // TODO(bemasc): uncomment once delivery of ICECompleted is reliable
+    // (https://code.google.com/p/webrtc/issues/detail?id=3021).
+    //
+    // offeringExpectations.expectIceConnectionChange(
+    //     IceConnectionState.COMPLETED);
     answeringExpectations.expectIceConnectionChange(
         IceConnectionState.CHECKING);
     answeringExpectations.expectIceConnectionChange(