deps: bump up googletest to v1.17.0

Signed-off-by: Rohit Agrawal <[email protected]>

Author: agrawroh

bazel/googletest.patch

@@ -571,9 +571,8 @@ def _com_github_ncopa_suexec():
 
 def _com_google_googletest():
     external_http_archive(
-        "com_google_googletest",
-        patches = ["@envoy//bazel:googletest.patch"],
-        patch_args = ["-p1"],
+        name = "com_google_googletest",
+        repo_mapping = {"@abseil-cpp": "@com_google_absl", "@re2": "@com_googlesource_code_re2"},
     )
 
 # TODO(jmarantz): replace the use of bind and external_deps with just

bazel/repositories.bzl

@@ -910,13 +910,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Google Test",
         project_desc = "Google's C++ test framework",
         project_url = "https://github.com/google/googletest",
-        # Pick up fix for MOCK_METHOD compilation with clang-cl for Windows (resolved after 1.10.0)
-        # see https://github.com/google/googletest/issues/2490
-        version = "a4ab0abb93620ce26efad9de9296b73b16e88588",
-        sha256 = "7897bfaa5ad39a479177cfb5c3ce010184dbaee22a7c3727b212282871918751",
+        version = "1.17.0",
+        sha256 = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c",
         strip_prefix = "googletest-{version}",
-        urls = ["https://github.com/google/googletest/archive/{version}.tar.gz"],
-        release_date = "2020-09-10",
+        urls = ["https://github.com/google/googletest/releases/download/v{version}/googletest-{version}.tar.gz"],
+        release_date = "2025-04-30",
         use_category = ["test_only"],
         cpe = "cpe:2.3:a:google:google_test:*",
         license = "BSD-3-Clause",

bazel/repository_locations.bzl

@@ -85,9 +85,10 @@ void runCleanupHooks() {
 // LLVMFuzzerInitialize() is called by LibFuzzer once before fuzzing starts.
 // NOLINTNEXTLINE(readability-identifier-naming)
 extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv) {
-  // Before parsing gmock flags, set the default value of flag --gmock_verbose to "error".
-  // This suppresses logs from NiceMock objects, which can be noisy and provide little value.
-  testing::GMOCK_FLAG(verbose) = "error";
+  // Set Google Test/Google Mock verbosity to error level to suppress noisy NiceMock logs
+  char* new_argv[] = {(*argv)[0], const_cast<char*>("--gtest_verbose=error")};
+  *argv = new_argv;
+  *argc = 2;
   testing::InitGoogleMock(argc, *argv);
   Envoy::Fuzz::Runner::setupEnvironment(1, *argv, spdlog::level::critical);
   atexit(Envoy::Fuzz::runCleanupHooks);

test/fuzz/fuzz_runner.cc

@@ -163,7 +163,7 @@ TEST_P(TcpProxyOdcdsIntegrationTest, SingleTcpClient) {
   ASSERT_TRUE(fake_upstream_connection->waitForDisconnect());
   tcp_client->waitForHalfClose();
   tcp_client->close();
-  assertOnDemandCounters(1, 0, 0);
+  EXPECT_TRUE(assertOnDemandCounters(1, 0, 0));
 }
 
 // Verify only one delta xds response is needed for multiple tcp_proxy requests.
@@ -249,7 +249,7 @@ TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownConnectionOnTimeout) {
 
   tcp_client->waitForHalfClose();
   tcp_client->close();
-  assertOnDemandCounters(0, 0, 1);
+  EXPECT_TRUE(assertOnDemandCounters(0, 0, 1));
 }
 
 TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownConnectionOnClusterMissing) {
@@ -277,7 +277,7 @@ TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownConnectionOnClusterMissing) {
 
   tcp_client->waitForHalfClose();
   tcp_client->close();
-  assertOnDemandCounters(0, 1, 0);
+  EXPECT_TRUE(assertOnDemandCounters(0, 1, 0));
 }
 
 TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownAllConnectionsOnClusterLookupTimeout) {
@@ -306,7 +306,7 @@ TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownAllConnectionsOnClusterLookupTimeou
 
   tcp_client_1->waitForHalfClose(true);
   tcp_client_2->waitForHalfClose(true);
-  assertOnDemandCounters(0, 0, 2);
+  EXPECT_TRUE(assertOnDemandCounters(0, 0, 2));
   tcp_client_1->close();
   tcp_client_2->close();
 }
@@ -331,7 +331,7 @@ TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownTcpClientBeforeOdcdsResponse) {
   EXPECT_EQ(1, test_server_->counter("tcp.tcpproxy_stats.on_demand_cluster_attempt")->value());
   // Client disconnect when the tcp proxy is waiting for the on demand response.
   tcp_client->close();
-  assertOnDemandCounters(0, 0, 0);
+  EXPECT_TRUE(assertOnDemandCounters(0, 0, 0));
 }
 
 } // namespace

test/integration/tcp_proxy_odcds_integration_test.cc

@@ -1,8 +1,8 @@
 #include "test/test_common/test_random_generator.h"
 
+#include "absl/flags/flag.h"
 #include "gtest/gtest.h"
-
-using testing::GTEST_FLAG(random_seed);
+#include "gtest/internal/gtest-port.h" // for GTEST_FLAG_GET
 
 namespace Envoy {
 
@@ -16,7 +16,8 @@ int32_t getSeed() {
 }
 
 TestRandomGenerator::TestRandomGenerator()
-    : seed_(GTEST_FLAG(random_seed) == 0 ? getSeed() : GTEST_FLAG(random_seed)), generator_(seed_) {
+    : seed_(GTEST_FLAG_GET(random_seed) == 0 ? getSeed() : GTEST_FLAG_GET(random_seed)),
+      generator_(seed_) {
   ENVOY_LOG_MISC(info, "TestRandomGenerator running with seed {}", seed_);
 }
 

test/test_common/test_random_generator.cc

@@ -15,6 +15,8 @@
 #include "test/test_listener.h"
 
 #include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "gtest/internal/gtest-port.h" // for GTEST_FLAG_SET
 
 namespace Envoy {
 
@@ -90,7 +92,7 @@ int TestRunner::runTests(int argc, char** argv) {
 
   // Use the recommended, but not default, "threadsafe" style for the Death Tests.
   // See: https://github.com/google/googletest/commit/84ec2e0365d791e4ebc7ec249f09078fb5ab6caa
-  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
 
   // Set gtest properties
   // (https://github.com/google/googletest/blob/master/googletest/docs/advanced.md#logging-additional-information),