summaryrefslogtreecommitdiff
path: root/test/buildtool/execution_api
diff options
context:
space:
mode:
authorPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-07-12 09:56:36 +0200
committerPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-07-16 17:51:12 +0200
commited0cd750a98a9334f95d99a5ba4ce3abe17538f1 (patch)
tree371a81a9c211cb103ff4e768ccace131f32ee5ee /test/buildtool/execution_api
parent0d65f1285899230497fa50efdaf4387092c08d61 (diff)
downloadjustbuild-ed0cd750a98a9334f95d99a5ba4ce3abe17538f1.tar.gz
test: Reduce verbosity in config methods
As the classes describe the config type, their static creators can have generic names, which reduces unnecessary verbosity.
Diffstat (limited to 'test/buildtool/execution_api')
-rw-r--r--test/buildtool/execution_api/bazel/bazel_api.test.cpp2
-rw-r--r--test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp2
-rwxr-xr-xtest/buildtool/execution_api/bazel/bazel_execution_client.test.cpp4
-rw-r--r--test/buildtool/execution_api/bazel/bazel_network.test.cpp4
-rw-r--r--test/buildtool/execution_api/bazel/bytestream_client.test.cpp4
5 files changed, 8 insertions, 8 deletions
diff --git a/test/buildtool/execution_api/bazel/bazel_api.test.cpp b/test/buildtool/execution_api/bazel/bazel_api.test.cpp
index 073bf08d..8c2d6633 100644
--- a/test/buildtool/execution_api/bazel/bazel_api.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_api.test.cpp
@@ -25,7 +25,7 @@ namespace {
auto const kApiFactory = []() {
static auto const& server = RemoteExecutionConfig::RemoteAddress();
- auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+ auto auth_config = TestAuthConfig::ReadFromEnvironment();
REQUIRE(auth_config);
return IExecutionApi::Ptr{new BazelApi{
"remote-execution", server->host, server->port, &*auth_config, {}}};
diff --git a/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp b/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp
index 85a23590..4cd5e13b 100644
--- a/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp
@@ -32,7 +32,7 @@ TEST_CASE("Bazel internals: CAS Client", "[execution_api]") {
std::string instance_name{"remote-execution"};
std::string content("test");
- auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+ auto auth_config = TestAuthConfig::ReadFromEnvironment();
REQUIRE(auth_config);
// Create CAS client
diff --git a/test/buildtool/execution_api/bazel/bazel_execution_client.test.cpp b/test/buildtool/execution_api/bazel/bazel_execution_client.test.cpp
index fe9da14f..c1f70ecc 100755
--- a/test/buildtool/execution_api/bazel/bazel_execution_client.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_execution_client.test.cpp
@@ -30,7 +30,7 @@ TEST_CASE("Bazel internals: Execution Client", "[execution_api]") {
auto test_digest = static_cast<bazel_re::Digest>(
ArtifactDigest::Create<ObjectType::File>(content));
- auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+ auto auth_config = TestAuthConfig::ReadFromEnvironment();
REQUIRE(auth_config);
BazelExecutionClient execution_client(
@@ -102,7 +102,7 @@ TEST_CASE("Bazel internals: Execution Client using env variables",
auto test_digest = static_cast<bazel_re::Digest>(
ArtifactDigest::Create<ObjectType::File>(content));
- auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+ auto auth_config = TestAuthConfig::ReadFromEnvironment();
REQUIRE(auth_config);
BazelExecutionClient execution_client(
diff --git a/test/buildtool/execution_api/bazel/bazel_network.test.cpp b/test/buildtool/execution_api/bazel/bazel_network.test.cpp
index 54d99305..443ca30d 100644
--- a/test/buildtool/execution_api/bazel/bazel_network.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_network.test.cpp
@@ -33,7 +33,7 @@ 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::ReadAuthConfigFromEnvironment();
+ auto auth_config = TestAuthConfig::ReadFromEnvironment();
REQUIRE(auth_config);
auto network =
BazelNetwork{instance_name, info->host, info->port, &*auth_config, {}};
@@ -81,7 +81,7 @@ TEST_CASE("Bazel network: read blobs with unknown size", "[execution_api]") {
auto const& info = RemoteExecutionConfig::RemoteAddress();
std::string instance_name{"remote-execution"};
- auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+ auto auth_config = TestAuthConfig::ReadFromEnvironment();
REQUIRE(auth_config);
auto network =
BazelNetwork{instance_name, info->host, info->port, &*auth_config, {}};
diff --git a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp
index 9903039b..3b936068 100644
--- a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp
+++ b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp
@@ -30,7 +30,7 @@ constexpr std::size_t kLargeSize = GRPC_DEFAULT_MAX_RECV_MESSAGE_LENGTH + 1;
TEST_CASE("ByteStream Client: Transfer single blob", "[execution_api]") {
auto const& info = RemoteExecutionConfig::RemoteAddress();
- auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+ auto auth_config = TestAuthConfig::ReadFromEnvironment();
REQUIRE(auth_config);
auto stream = ByteStreamClient{info->host, info->port, &*auth_config};
auto uuid = CreateUUIDVersion4(*CreateProcessUniqueId());
@@ -110,7 +110,7 @@ TEST_CASE("ByteStream Client: Transfer single blob", "[execution_api]") {
TEST_CASE("ByteStream Client: Transfer multiple blobs", "[execution_api]") {
auto const& info = RemoteExecutionConfig::RemoteAddress();
- auto auth_config = TestAuthConfig::ReadAuthConfigFromEnvironment();
+ auto auth_config = TestAuthConfig::ReadFromEnvironment();
REQUIRE(auth_config);
auto stream = ByteStreamClient{info->host, info->port, &*auth_config};
auto uuid = CreateUUIDVersion4(*CreateProcessUniqueId());