Index: talk/app/webrtc/objctests/RTCPeerConnectionSyncObserver.m |
diff --git a/talk/app/webrtc/objctests/RTCPeerConnectionSyncObserver.m b/talk/app/webrtc/objctests/RTCPeerConnectionSyncObserver.m |
index 5070b789b899bcec92fa0e9a1854824eabd26367..04a4b577c6ffefc64298a742a322a8744f3f27a8 100644 |
--- a/talk/app/webrtc/objctests/RTCPeerConnectionSyncObserver.m |
+++ b/talk/app/webrtc/objctests/RTCPeerConnectionSyncObserver.m |
@@ -139,14 +139,19 @@ |
[_expectedMessages addObject:buffer]; |
} |
-- (void)waitForAllExpectationsToBeSatisfied { |
+- (BOOL)waitForAllExpectationsToBeSatisfiedWithTimeout:(int)timeoutSeconds { |
// TODO (fischman): Revisit. Keeping in sync with the Java version, but |
// polling is not optimal. |
// https://code.google.com/p/libjingle/source/browse/trunk/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java?line=212#212 |
+ NSDate *endTime = [NSDate dateWithTimeIntervalSinceNow:timeoutSeconds]; |
tkchin_webrtc
2015/09/25 15:40:32
Since you are using NSDate API, use NSTimeInterval
Taylor Brandstetter
2015/09/25 18:01:57
Done.
|
while (![self areAllExpectationsSatisfied]) { |
+ if ([endTime compare:[NSDate date]] != NSOrderedDescending) { |
tkchin_webrtc
2015/09/25 15:40:32
I think it's easier/clearer to use a comparison wi
Taylor Brandstetter
2015/09/25 18:01:57
Done.
|
+ return false; |
tkchin_webrtc
2015/09/25 15:40:32
return NO;
Taylor Brandstetter
2015/09/25 18:01:57
Done.
|
+ } |
[[NSRunLoop currentRunLoop] |
runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]]; |
} |
+ return true; |
tkchin_webrtc
2015/09/25 15:40:32
return YES;
Taylor Brandstetter
2015/09/25 18:01:57
Done.
|
} |
#pragma mark - RTCPeerConnectionDelegate methods |