Revert "Skip NetworkTest if IPV4 is not available"
This reverts commit 73ae5ca594f4d33b8b4a8f1b2095958ab77f2c27. Reason for revert: Speculative revert due to downstream project breaking. Original change's description: > Skip NetworkTest if IPV4 is not available > > Bug: b/292167110 > Change-Id: I6d55524e53d134d9828a85b9d38a4fea71f0af5b > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/314920 > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#40509} Bug: b/292167110 Change-Id: I1322d239e699e005419fbb33bf9b00eed0e07664 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/315000 Commit-Queue: Christoffer Jansson <jansson@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Christoffer Jansson <jansson@webrtc.org> Cr-Commit-Position: refs/heads/main@{#40515}
This commit is contained in:
parent
e2e04513e7
commit
c71bfccaa5
@ -21,7 +21,6 @@
|
||||
#include "absl/strings/string_view.h"
|
||||
#include "rtc_base/checks.h"
|
||||
#include "rtc_base/net_helpers.h"
|
||||
#include "rtc_base/net_test_helpers.h"
|
||||
#include "rtc_base/network_monitor.h"
|
||||
#include "rtc_base/network_monitor_factory.h"
|
||||
#include "rtc_base/physical_socket_server.h"
|
||||
@ -46,12 +45,6 @@ using ::testing::UnorderedElementsAreArray;
|
||||
|
||||
namespace rtc {
|
||||
|
||||
#define MAYBE_SKIP_IPV4 \
|
||||
if (!HasIPv4Enabled()) { \
|
||||
RTC_LOG(LS_INFO) << "No IPv4... skipping"; \
|
||||
return; \
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
IPAddress IPFromString(absl::string_view str) {
|
||||
@ -1270,7 +1263,6 @@ TEST_F(NetworkTest, TestNetworkMonitoring) {
|
||||
#define MAYBE_DefaultLocalAddress DefaultLocalAddress
|
||||
#endif
|
||||
TEST_F(NetworkTest, MAYBE_DefaultLocalAddress) {
|
||||
MAYBE_SKIP_IPV4;
|
||||
IPAddress ip;
|
||||
FakeNetworkMonitorFactory factory;
|
||||
PhysicalSocketServer socket_server;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user