Enable IceStatesReachCompletionWithRemoteHostname for all

This is verifying the theory that the fix on bug 12592 also fixed
bug 3608.

Bug: webrtc:3608, webrtc:12592
Change-Id: Ia1f5ba5ebdc9a839034092351c970c3b6a159fa2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264829
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37113}
This commit is contained in:
Harald Alvestrand
2022-06-02 13:24:32 +00:00
committed by WebRTC LUCI CQ
parent 55a5588f77
commit 099ff62d94

View File

@ -1787,25 +1787,14 @@ TEST_P(PeerConnectionIntegrationTest, IceStatesReachCompletion) {
callee()->ice_connection_state(), kDefaultTimeout);
}
#if !defined(THREAD_SANITIZER)
// This test provokes TSAN errors. See bugs.webrtc.org/3608
constexpr int kOnlyLocalPorts = cricket::PORTALLOCATOR_DISABLE_STUN |
cricket::PORTALLOCATOR_DISABLE_RELAY |
cricket::PORTALLOCATOR_DISABLE_TCP;
// Use a mock resolver to resolve the hostname back to the original IP on both
// sides and check that the ICE connection connects.
// TODO(bugs.webrtc.org/12590): Flaky on Windows and on Linux MSAN.
#if defined(WEBRTC_WIN)
#define MAYBE_IceStatesReachCompletionWithRemoteHostname \
DISABLED_IceStatesReachCompletionWithRemoteHostname
#else
#define MAYBE_IceStatesReachCompletionWithRemoteHostname \
IceStatesReachCompletionWithRemoteHostname
#endif
TEST_P(PeerConnectionIntegrationTest,
MAYBE_IceStatesReachCompletionWithRemoteHostname) {
IceStatesReachCompletionWithRemoteHostname) {
auto caller_resolver_factory =
std::make_unique<NiceMock<webrtc::MockAsyncResolverFactory>>();
auto callee_resolver_factory =
@ -1859,8 +1848,6 @@ TEST_P(PeerConnectionIntegrationTest,
DestroyPeerConnections();
}
#endif // !defined(THREAD_SANITIZER)
// Test that firewalling the ICE connection causes the clients to identify the
// disconnected state and then removing the firewall causes them to reconnect.
class PeerConnectionIntegrationIceStatesTest