Add unit tests for DiskCacheClient.

PiperOrigin-RevId: 621903694 Change-Id: I735a0404952a75b4dbaaedd443da1f446764387e
Kila2 · May 13, 2024 · 648bfd6 · 648bfd6
1 parent d618972
commit 648bfd6
Show file tree

Hide file tree

Showing 3 changed files with 374 additions and 4 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/remote/disk/DiskCacheClient.java b/src/main/java/com/google/devtools/build/lib/remote/disk/DiskCacheClient.java
@@ -382,11 +382,13 @@ private void saveFile(Digest digest, Store store, InputStream in) throws IOExcep
     Path temp = getTempPath();
 
     try {
-      try (FileOutputStream out = new FileOutputStream(temp.getPathFile())) {
+      try (OutputStream out = temp.getOutputStream()) {
         ByteStreams.copy(in, out);
         // Fsync temp before we rename it to avoid data loss in the case of machine
         // crashes (the OS may reorder the writes and the rename).
-        out.getFD().sync();
+        if (out instanceof FileOutputStream fos) {
+          fos.getFD().sync();
+        }
       }
       path.getParentDirectory().createDirectoryAndParents();
       temp.renameTo(path);

diff --git a/src/test/java/com/google/devtools/build/lib/remote/disk/BUILD b/src/test/java/com/google/devtools/build/lib/remote/disk/BUILD
@@ -20,15 +20,21 @@ java_test(
     deps = [
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/exec:spawn_runner",
+        "//src/main/java/com/google/devtools/build/lib/remote:store",
         "//src/main/java/com/google/devtools/build/lib/remote/common",
+        "//src/main/java/com/google/devtools/build/lib/remote/common:cache_not_found_exception",
         "//src/main/java/com/google/devtools/build/lib/remote/disk",
         "//src/main/java/com/google/devtools/build/lib/remote/util",
         "//src/main/java/com/google/devtools/build/lib/vfs",
+        "//src/main/java/com/google/devtools/build/lib/vfs/bazel",
         "//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
         "//src/test/java/com/google/devtools/build/lib:test_runner",
+        "//third_party:error_prone_annotations",
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:mockito",
+        "//third_party:truth",
+        "//third_party/protobuf:protobuf_java",
         "@remoteapis//:build_bazel_remote_execution_v2_remote_execution_java_proto",
     ],
 )