[core] fix authentication token related tests in windows (#58444)

fix a typo (missing semicolon) in authentication_token_loader_test and
use cross env compatible `ray::UnsetEnv()` and `ray::setEnv()` in tests

---------

Signed-off-by: sampan <[email protected]>
Co-authored-by: sampan <[email protected]>

Author: sampan-s-nayak

src/ray/pubsub/tests/BUILD.bazel

@@ -54,6 +54,7 @@ ray_cc_test(
         "//src/ray/rpc:grpc_server",
         "//src/ray/rpc/authentication:authentication_token",
         "//src/ray/rpc/authentication:authentication_token_loader",
+        "//src/ray/util:env",
         "@com_google_googletest//:gtest_main",
     ],
 )

src/ray/pubsub/tests/python_gcs_subscriber_auth_test.cc

@@ -24,6 +24,7 @@
 #include "ray/rpc/authentication/authentication_token.h"
 #include "ray/rpc/authentication/authentication_token_loader.h"
 #include "ray/rpc/grpc_server.h"
+#include "ray/util/env.h"
 #include "src/ray/protobuf/gcs_service.grpc.pb.h"
 
 namespace ray {
@@ -95,7 +96,7 @@ class PythonGcsSubscriberAuthTest : public ::testing::Test {
       server_->Shutdown();
       server_.reset();
     }
-    unsetenv("RAY_AUTH_TOKEN");
+    ray::UnsetEnv("RAY_AUTH_TOKEN");
     // Reset to default auth mode
     RayConfig::instance().initialize(R"({"auth_mode": "disabled"})");
     rpc::AuthenticationTokenLoader::instance().ResetCache();
@@ -135,10 +136,10 @@ class PythonGcsSubscriberAuthTest : public ::testing::Test {
   // Set client authentication token via environment variable
   void SetClientToken(const std::string &client_token) {
     if (!client_token.empty()) {
-      setenv("RAY_AUTH_TOKEN", client_token.c_str(), 1);
+      ray::SetEnv("RAY_AUTH_TOKEN", client_token);
       RayConfig::instance().initialize(R"({"auth_mode": "token"})");
     } else {
-      unsetenv("RAY_AUTH_TOKEN");
+      ray::UnsetEnv("RAY_AUTH_TOKEN");
       RayConfig::instance().initialize(R"({"auth_mode": "disabled"})");
     }
     rpc::AuthenticationTokenLoader::instance().ResetCache();

src/ray/ray_syncer/tests/BUILD.bazel

@@ -14,6 +14,7 @@ ray_cc_test(
         "//src/ray/ray_syncer",
         "//src/ray/rpc:grpc_server",
         "//src/ray/rpc/authentication:authentication_token",
+        "//src/ray/util:env",
         "//src/ray/util:network_util",
         "//src/ray/util:path_utils",
         "//src/ray/util:raii",

src/ray/ray_syncer/tests/ray_syncer_test.cc

@@ -39,6 +39,7 @@
 #include "ray/ray_syncer/ray_syncer_server.h"
 #include "ray/rpc/authentication/authentication_token.h"
 #include "ray/rpc/grpc_server.h"
+#include "ray/util/env.h"
 #include "ray/util/network_util.h"
 #include "ray/util/path_utils.h"
 #include "ray/util/raii.h"
@@ -993,13 +994,13 @@ class SyncerAuthenticationTest : public ::testing::Test {
  protected:
   void SetUp() override {
     // Clear any existing environment variables and reset state
-    unsetenv("RAY_AUTH_TOKEN");
+    ray::UnsetEnv("RAY_AUTH_TOKEN");
     ray::rpc::AuthenticationTokenLoader::instance().ResetCache();
     RayConfig::instance().auth_mode() = "disabled";
   }
 
   void TearDown() override {
-    unsetenv("RAY_AUTH_TOKEN");
+    ray::UnsetEnv("RAY_AUTH_TOKEN");
     ray::rpc::AuthenticationTokenLoader::instance().ResetCache();
     RayConfig::instance().auth_mode() = "disabled";
   }
@@ -1083,7 +1084,7 @@ TEST_F(SyncerAuthenticationTest, MatchingTokens) {
   const std::string test_token = "matching-test-token-12345";
 
   // Set client token via environment variable
-  setenv("RAY_AUTH_TOKEN", test_token.c_str(), 1);
+  ray::SetEnv("RAY_AUTH_TOKEN", test_token);
   // Enable token authentication
   RayConfig::instance().auth_mode() = "token";
   ray::rpc::AuthenticationTokenLoader::instance().ResetCache();
@@ -1110,7 +1111,7 @@ TEST_F(SyncerAuthenticationTest, MismatchedTokens) {
   const std::string client_token = "different-client-token";
 
   // Set client token via environment variable
-  setenv("RAY_AUTH_TOKEN", client_token.c_str(), 1);
+  ray::SetEnv("RAY_AUTH_TOKEN", client_token);
   // Enable token authentication
   RayConfig::instance().auth_mode() = "token";
   ray::rpc::AuthenticationTokenLoader::instance().ResetCache();
@@ -1136,7 +1137,7 @@ TEST_F(SyncerAuthenticationTest, ServerHasTokenClientDoesNot) {
   const std::string server_token = "server-token-12345";
 
   // Client has no token - auth mode is disabled (default from SetUp)
-  unsetenv("RAY_AUTH_TOKEN");
+  ray::UnsetEnv("RAY_AUTH_TOKEN");
   ray::rpc::AuthenticationTokenLoader::instance().ResetCache();
 
   // Create authenticated server
@@ -1161,7 +1162,7 @@ TEST_F(SyncerAuthenticationTest, ClientHasTokenServerDoesNotRequire) {
   const std::string client_token = "different-client-token";
 
   // Set client token
-  setenv("RAY_AUTH_TOKEN", client_token.c_str(), 1);
+  ray::SetEnv("RAY_AUTH_TOKEN", client_token);
   // Enable token authentication
   RayConfig::instance().auth_mode() = "token";
   ray::rpc::AuthenticationTokenLoader::instance().ResetCache();

src/ray/raylet/tests/BUILD.bazel

@@ -91,6 +91,7 @@ ray_cc_test(
         "//src/ray/common:id",
         "//src/ray/protobuf:runtime_env_agent_cc_proto",
         "//src/ray/raylet:runtime_env_agent_client",
+        "//src/ray/util:env",
         "@boost//:asio",
         "@boost//:beast",
         "@boost//:thread",

src/ray/raylet/tests/runtime_env_agent_client_test.cc

@@ -33,6 +33,7 @@
 #include "ray/common/id.h"
 #include "ray/common/ray_config.h"
 #include "ray/rpc/authentication/authentication_token_loader.h"
+#include "ray/util/env.h"
 #include "src/ray/protobuf/runtime_env_agent.pb.h"
 
 namespace ray {
@@ -194,7 +195,7 @@ auto dummy_shutdown_raylet_gracefully = [](const rpc::NodeDeathInfo &) {};
 
 TEST(RuntimeEnvAgentClientTest, GetOrCreateRuntimeEnvOK) {
   RayConfig::instance().initialize(R"({"auth_mode": "disabled"})");
-  unsetenv("RAY_AUTH_TOKEN");
+  ray::UnsetEnv("RAY_AUTH_TOKEN");
   rpc::AuthenticationTokenLoader::instance().ResetCache();
 
   int port = GetFreePort();
@@ -366,7 +367,7 @@ TEST(RuntimeEnvAgentClientTest, GetOrCreateRuntimeEnvRetriesOnServerNotStarted)
 
 TEST(RuntimeEnvAgentClientTest, AttachesAuthHeaderWhenEnabled) {
   RayConfig::instance().initialize(R"({"auth_mode": "token"})");
-  setenv("RAY_AUTH_TOKEN", "header_token", 1);
+  ray::SetEnv("RAY_AUTH_TOKEN", "header_token");
   rpc::AuthenticationTokenLoader::instance().ResetCache();
 
   int port = GetFreePort();
@@ -428,7 +429,7 @@ TEST(RuntimeEnvAgentClientTest, AttachesAuthHeaderWhenEnabled) {
   ASSERT_EQ(observed_auth_header, "Bearer header_token");
 
   RayConfig::instance().initialize(R"({"auth_mode": "disabled"})");
-  unsetenv("RAY_AUTH_TOKEN");
+  ray::UnsetEnv("RAY_AUTH_TOKEN");
   rpc::AuthenticationTokenLoader::instance().ResetCache();
 }
 

src/ray/rpc/tests/BUILD.bazel

@@ -52,6 +52,7 @@ ray_cc_test(
         "//src/ray/rpc:grpc_client",
         "//src/ray/rpc:grpc_server",
         "//src/ray/rpc/authentication:authentication_token_loader",
+        "//src/ray/util:env",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -79,6 +80,7 @@ ray_cc_test(
     deps = [
         "//src/ray/common:ray_config",
         "//src/ray/rpc/authentication:authentication_token_loader",
+        "//src/ray/util:env",
         "@com_google_googletest//:gtest_main",
     ],
 )

src/ray/rpc/tests/authentication_token_loader_test.cc

@@ -19,6 +19,7 @@
 
 #include "gtest/gtest.h"
 #include "ray/common/ray_config.h"
+#include "ray/util/env.h"
 
 #if defined(__APPLE__) || defined(__linux__)
 #include <sys/stat.h>
@@ -107,21 +108,9 @@ class AuthenticationTokenLoaderTest : public ::testing::Test {
 #endif
   }
 
-  void set_env_var(const char *name, const char *value) {
-#ifdef _WIN32
-    _putenv_s(name, value);
-#else
-    setenv(name, value, 1);
-#endif
-  }
+  void set_env_var(const char *name, const char *value) { ray::SetEnv(name, value); }
 
-  void unset_env_var(const char *name) {
-#ifdef _WIN32
-    _putenv_s(name, "")
-#else
-    unsetenv(name);
-#endif
-  }
+  void unset_env_var(const char *name) { ray::UnsetEnv(name); }
 
   void ensure_ray_dir_exists() {
 #ifdef _WIN32

src/ray/rpc/tests/grpc_auth_token_tests.cc

@@ -23,6 +23,7 @@
 #include "ray/rpc/grpc_client.h"
 #include "ray/rpc/grpc_server.h"
 #include "ray/rpc/tests/grpc_test_common.h"
+#include "ray/util/env.h"
 #include "src/ray/protobuf/test_service.grpc.pb.h"
 
 namespace ray {
@@ -42,11 +43,11 @@ class TestGrpcServerClientTokenAuthFixture : public ::testing::Test {
     // Set client token in environment for ClientCallManager to read from
     // AuthenticationTokenLoader
     if (!client_token.empty()) {
-      setenv("RAY_AUTH_TOKEN", client_token.c_str(), 1);
+      ray::SetEnv("RAY_AUTH_TOKEN", client_token);
     } else {
       RayConfig::instance().initialize(R"({"auth_mode": "disabled"})");
       AuthenticationTokenLoader::instance().ResetCache();
-      unsetenv("RAY_AUTH_TOKEN");
+      ray::UnsetEnv("RAY_AUTH_TOKEN");
     }
 
     // Start client thread FIRST
@@ -115,8 +116,8 @@ class TestGrpcServerClientTokenAuthFixture : public ::testing::Test {
     }
 
     // Clean up environment variables
-    unsetenv("RAY_AUTH_TOKEN");
-    unsetenv("RAY_AUTH_TOKEN_PATH");
+    ray::UnsetEnv("RAY_AUTH_TOKEN");
+    ray::UnsetEnv("RAY_AUTH_TOKEN_PATH");
     // Reset the token loader for test isolation
     AuthenticationTokenLoader::instance().ResetCache();
   }