From 99d7d6b4f67c92f6c6e193aca68284634bc25566 Mon Sep 17 00:00:00 2001
From: Jeremy Leconte <jleconte@google.com>
Date: Fri, 19 Aug 2022 09:29:55 +0200
Subject: [PATCH] Reenable some iOS tests.
These tests were failing on mac-11 machines but seem to do fine on mac-12.
Bug: webrtc:13989,webrtc:13991
Change-Id: I11fb2302046fbb06b0824a4adc543a446405991b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/272363
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#37843}
---
examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm | 3 ---
sdk/objc/unittests/RTCPeerConnectionFactory_xctest.m | 5 ++---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
index 60c8d7ef60..2694e49914 100644
--- a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
+++ b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
@@ -161,8 +161,6 @@
#pragma mark - Cases
-// TODO(crbug.com/webrtc/13991): testSession crashes when running on simulators.
-#if !TARGET_IPHONE_SIMULATOR
// Tests that an ICE connection is established between two ARDAppClient objects
// where one is set up as a caller and the other the answerer. Network
// components are mocked out and messages are relayed directly from object to
@@ -229,7 +227,6 @@
}
}];
}
-#endif
// Test to see that we get a local video connection
// Note this will currently pass even when no camera is connected as a local
diff --git a/sdk/objc/unittests/RTCPeerConnectionFactory_xctest.m b/sdk/objc/unittests/RTCPeerConnectionFactory_xctest.m
index 0c5a96cd2f..28743a6fc1 100644
--- a/sdk/objc/unittests/RTCPeerConnectionFactory_xctest.m
+++ b/sdk/objc/unittests/RTCPeerConnectionFactory_xctest.m
@@ -131,11 +131,10 @@
XCTAssertTrue(true, "Expect test does not crash");
}
-// TODO(crbug.com/webrtc/13989): Remove call to CreateSender in senderWithKind.
-#if !TARGET_IPHONE_SIMULATOR
- (void)testRTCRtpSenderLifetime {
@autoreleasepool {
RTC_OBJC_TYPE(RTCConfiguration) *config = [[RTC_OBJC_TYPE(RTCConfiguration) alloc] init];
+ config.sdpSemantics = RTCSdpSemanticsPlanB;
RTC_OBJC_TYPE(RTCMediaConstraints) *constraints =
[[RTC_OBJC_TYPE(RTCMediaConstraints) alloc] initWithMandatoryConstraints:@{}
optionalConstraints:nil];
@@ -163,6 +162,7 @@
- (void)testRTCRtpReceiverLifetime {
@autoreleasepool {
RTC_OBJC_TYPE(RTCConfiguration) *config = [[RTC_OBJC_TYPE(RTCConfiguration) alloc] init];
+ config.sdpSemantics = RTCSdpSemanticsPlanB;
RTC_OBJC_TYPE(RTCMediaConstraints) *constraints =
[[RTC_OBJC_TYPE(RTCMediaConstraints) alloc] initWithMandatoryConstraints:@{}
optionalConstraints:nil];
@@ -206,7 +206,6 @@
XCTAssertTrue(true, "Expect test does not crash");
}
-#endif
- (void)testAudioSourceLifetime {
@autoreleasepool {