From a01daf0359e2ce113a928b6dee326b084baa4f04 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Sat, 8 Mar 2014 03:17:55 +0000 Subject: [PATCH] RTCPeerConnectionTest(objc): deflake by ignoring ICECompleted. Delivery of the state seems intermittent at best on OS/X so ignore it until we can make it reliable. BUG=1414,2993,chromium:348982 TBR=bemasc@chromium.org Review URL: https://webrtc-codereview.appspot.com/9609004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5664 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/objctests/RTCPeerConnectionSyncObserver.m | 3 +++ talk/app/webrtc/objctests/RTCPeerConnectionTest.mm | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/talk/app/webrtc/objctests/RTCPeerConnectionSyncObserver.m b/talk/app/webrtc/objctests/RTCPeerConnectionSyncObserver.m index 0f33bac5cc..0604d67c56 100644 --- a/talk/app/webrtc/objctests/RTCPeerConnectionSyncObserver.m +++ b/talk/app/webrtc/objctests/RTCPeerConnectionSyncObserver.m @@ -183,6 +183,9 @@ - (void)peerConnection:(RTCPeerConnection *)peerConnection iceConnectionChanged:(RTCICEConnectionState)newState { + // See TODO(fischman) in RTCPeerConnectionTest.mm about Completed. + if (newState == RTCICEConnectionCompleted) + return; int expectedState = [self popFirstElementAsInt:_expectedICEConnectionChanges]; NSAssert(expectedState == (int)newState, @"Empty expectation array"); } diff --git a/talk/app/webrtc/objctests/RTCPeerConnectionTest.mm b/talk/app/webrtc/objctests/RTCPeerConnectionTest.mm index 8605ef0e54..2acd7f9698 100644 --- a/talk/app/webrtc/objctests/RTCPeerConnectionTest.mm +++ b/talk/app/webrtc/objctests/RTCPeerConnectionTest.mm @@ -181,7 +181,9 @@ [offeringExpectations expectICEConnectionChange:RTCICEConnectionChecking]; [offeringExpectations expectICEConnectionChange:RTCICEConnectionConnected]; - [offeringExpectations expectICEConnectionChange:RTCICEConnectionCompleted]; + // TODO(fischman): figure out why this is flaky and re-introduce (and remove + // special-casing from the observer!). + // [offeringExpectations expectICEConnectionChange:RTCICEConnectionCompleted]; [answeringExpectations expectICEConnectionChange:RTCICEConnectionChecking]; [answeringExpectations expectICEConnectionChange:RTCICEConnectionConnected];