From 62d204ff4cc94c12c1635f189255710901682825 Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Fri, 12 Jul 2024 16:09:28 +0200 Subject: Remove the RemoteExecutionConfig singleton ...and replace it with passed instances created early via a builder pattern. Tests are also updated accordingly. --- .../execution_api/bazel/bazel_network.test.cpp | 29 +++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'test/buildtool/execution_api/bazel/bazel_network.test.cpp') diff --git a/test/buildtool/execution_api/bazel/bazel_network.test.cpp b/test/buildtool/execution_api/bazel/bazel_network.test.cpp index 443ca30d..59fd027f 100644 --- a/test/buildtool/execution_api/bazel/bazel_network.test.cpp +++ b/test/buildtool/execution_api/bazel/bazel_network.test.cpp @@ -27,16 +27,25 @@ #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "test/utils/remote_execution/test_auth_config.hpp" +#include "test/utils/remote_execution/test_remote_config.hpp" constexpr std::size_t kLargeSize = GRPC_DEFAULT_MAX_RECV_MESSAGE_LENGTH + 1; TEST_CASE("Bazel network: write/read blobs", "[execution_api]") { - auto const& info = RemoteExecutionConfig::RemoteAddress(); std::string instance_name{"remote-execution"}; + auto auth_config = TestAuthConfig::ReadFromEnvironment(); REQUIRE(auth_config); - auto network = - BazelNetwork{instance_name, info->host, info->port, &*auth_config, {}}; + + auto remote_config = TestRemoteConfig::ReadFromEnvironment(); + REQUIRE(remote_config); + REQUIRE(remote_config->remote_address); + + auto network = BazelNetwork{instance_name, + remote_config->remote_address->host, + remote_config->remote_address->port, + &*auth_config, + {}}; std::string content_foo("foo"); std::string content_bar("bar"); @@ -79,12 +88,20 @@ TEST_CASE("Bazel network: read blobs with unknown size", "[execution_api]") { return; } - auto const& info = RemoteExecutionConfig::RemoteAddress(); std::string instance_name{"remote-execution"}; + auto auth_config = TestAuthConfig::ReadFromEnvironment(); REQUIRE(auth_config); - auto network = - BazelNetwork{instance_name, info->host, info->port, &*auth_config, {}}; + + auto remote_config = TestRemoteConfig::ReadFromEnvironment(); + REQUIRE(remote_config); + REQUIRE(remote_config->remote_address); + + auto network = BazelNetwork{instance_name, + remote_config->remote_address->host, + remote_config->remote_address->port, + &*auth_config, + {}}; std::string content_foo("foo"); std::string content_bar(kLargeSize, 'x'); // single larger blob -- cgit v1.2.3