From e0a542180e60233eb203c227e45b03efc5ed42f2 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Wed, 29 Jan 2025 16:28:27 +0100 Subject: BazelCasClient: Use ArtifactDigest in FindMissingBlobs --- test/buildtool/execution_api/bazel/TARGETS | 2 -- .../execution_api/bazel/bazel_cas_client.test.cpp | 19 +------------------ 2 files changed, 1 insertion(+), 20 deletions(-) (limited to 'test/buildtool/execution_api') diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS index 88915e7e..84676f67 100644 --- a/test/buildtool/execution_api/bazel/TARGETS +++ b/test/buildtool/execution_api/bazel/TARGETS @@ -6,8 +6,6 @@ [ ["@", "catch2", "", "catch2"] , ["@", "gsl", "", "gsl"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] - , ["@", "src", "src/buildtool/common", "bazel_digest_factory"] - , ["@", "src", "src/buildtool/common", "bazel_types"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common/remote", "remote_common"] , ["@", "src", "src/buildtool/common/remote", "retry_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 606212a6..503561cf 100644 --- a/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp +++ b/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp @@ -24,8 +24,6 @@ #include "gsl/gsl" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" -#include "src/buildtool/common/bazel_digest_factory.hpp" -#include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/crypto/hash_function.hpp" @@ -59,15 +57,12 @@ TEST_CASE("Bazel internals: CAS Client", "[execution_api]") { HashFunction const hash_function{TestHashType::ReadFromEnvironment()}; auto const digest = ArtifactDigestFactory::HashDataAs( hash_function, content); - auto bazel_digest = BazelDigestFactory::HashDataAs( - hash_function, content); // Valid blob ArtifactBlob blob{digest, content, /*is_exec=*/false}; // Search blob via digest - auto digests = - cas_client.FindMissingBlobs(instance_name, {bazel_digest}); + auto digests = cas_client.FindMissingBlobs(instance_name, {digest}); CHECK(digests.size() <= 1); if (not digests.empty()) { @@ -81,16 +76,4 @@ TEST_CASE("Bazel internals: CAS Client", "[execution_api]") { CHECK(blobs.begin()->digest == digest); CHECK(*blobs.begin()->data == content); } - - SECTION("Invalid digest and blob") { - // Faulty digest - bazel_re::Digest faulty_digest{}; - faulty_digest.set_hash( - "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"); - faulty_digest.set_size_bytes(4); - - // Search faulty digest - CHECK(cas_client.FindMissingBlobs(instance_name, {faulty_digest}) - .size() == 1); - } } -- cgit v1.2.3