From f83d656a0cf2f5c722d33f8f741039890992f629 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Tue, 4 Jun 2024 15:07:02 +0200 Subject: Move reading functionality to BazelNetworkReader ...to enable validation of received blobs. --- .../execution_api/bazel/bazel_network.test.cpp | 24 ++++++++-------------- 1 file changed, 9 insertions(+), 15 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 dff26a44..a1c5a986 100644 --- a/test/buildtool/execution_api/bazel/bazel_network.test.cpp +++ b/test/buildtool/execution_api/bazel/bazel_network.test.cpp @@ -50,14 +50,11 @@ TEST_CASE("Bazel network: write/read blobs", "[execution_api]") { REQUIRE(network.UploadBlobs(BazelBlobContainer{{foo, bar, baz}})); // Read blobs in order - auto reader = network.ReadBlobs( - {foo.digest, bar.digest, baz.digest, bar.digest, foo.digest}); - std::vector blobs{}; - while (true) { - auto next = reader.Next(); - if (next.empty()) { - break; - } + auto reader = network.CreateReader(); + std::vector to_read{ + foo.digest, bar.digest, baz.digest, bar.digest, foo.digest}; + std::vector blobs{}; + for (auto next : reader.ReadIncrementally(to_read)) { blobs.insert(blobs.end(), next.begin(), next.end()); } @@ -98,13 +95,10 @@ TEST_CASE("Bazel network: read blobs with unknown size", "[execution_api]") { bar.digest.set_size_bytes(0); // Read blobs - auto reader = network.ReadBlobs({foo.digest, bar.digest}); - std::vector blobs{}; - while (true) { - auto next = reader.Next(); - if (next.empty()) { - break; - } + auto reader = network.CreateReader(); + std::vector to_read{foo.digest, bar.digest}; + std::vector blobs{}; + for (auto next : reader.ReadIncrementally(to_read)) { blobs.insert(blobs.end(), next.begin(), next.end()); } -- cgit v1.2.3