From 83eb7dff5ca37c35ed096ce3ab7b70db2610335a Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Tue, 3 Jun 2014 16:38:08 +0000 Subject: [PATCH] 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 --- .../src/org/webrtc/PeerConnectionTest.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java b/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java index fddb503450..b171b58413 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 @@ public class PeerConnectionTest extends TestCase { @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 @@ public class PeerConnectionTest extends TestCase { 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(