Add more tests

Author: fmeum

src/main/java/com/google/devtools/build/lib/remote/RemoteActionFileSystem.java

@@ -371,7 +371,7 @@ protected boolean delete(PathFragment path) throws IOException {
   @Override
   protected InputStream getInputStream(PathFragment path) throws IOException {
     try {
-      materializeFileIfLazy(path);
+      materializeIfLazy(path);
     } catch (BulkTransferException e) {
       var newlyLostInputs = e.getLostArtifacts(inputArtifactData::getInput);
       if (!newlyLostInputs.isEmpty()) {

src/test/java/com/google/devtools/build/lib/remote/RemoteActionFileSystemTest.java

@@ -878,10 +878,7 @@ public void createSymbolicLink_localFileArtifact() throws Exception {
     // assert
     assertThat(symlinkActionFs.getFileSystem()).isSameInstanceAs(actionFs);
     assertThat(symlinkActionFs.readSymbolicLink()).isEqualTo(targetPath);
-    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).readSymbolicLink())
-        .isEqualTo(targetPath);
-    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).readSymbolicLink())
-        .isEqualTo(targetPath);
+    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).exists(Symlinks.NOFOLLOW)).isFalse();
   }
 
   @Test
@@ -901,11 +898,8 @@ public void createSymbolicLink_remoteFileArtifact() throws Exception {
     // assert
     assertThat(symlinkActionFs.getFileSystem()).isSameInstanceAs(actionFs);
     assertThat(symlinkActionFs.readSymbolicLink()).isEqualTo(targetPath);
-    assertThat(outputArtifact.getPath().readSymbolicLink()).isEqualTo(targetPath);
-    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).readSymbolicLink())
-        .isEqualTo(targetPath);
-    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).readSymbolicLink())
-        .isEqualTo(targetPath);
+    assertThat(outputArtifact.getPath().exists(Symlinks.NOFOLLOW)).isFalse();
+    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).exists(Symlinks.NOFOLLOW)).isFalse();
   }
 
   @Test
@@ -928,10 +922,7 @@ public void createSymbolicLink_localTreeArtifact() throws Exception {
     // assert
     assertThat(symlinkActionFs.getFileSystem()).isSameInstanceAs(actionFs);
     assertThat(symlinkActionFs.readSymbolicLink()).isEqualTo(targetPath);
-    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).readSymbolicLink())
-        .isEqualTo(targetPath);
-    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).readSymbolicLink())
-        .isEqualTo(targetPath);
+    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).exists(Symlinks.NOFOLLOW)).isFalse();
   }
 
   @Test
@@ -954,10 +945,7 @@ public void createSymbolicLink_remoteTreeArtifact() throws Exception {
     // assert
     assertThat(symlinkActionFs.getFileSystem()).isSameInstanceAs(actionFs);
     assertThat(symlinkActionFs.readSymbolicLink()).isEqualTo(targetPath);
-    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).readSymbolicLink())
-        .isEqualTo(targetPath);
-    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).readSymbolicLink())
-        .isEqualTo(targetPath);
+    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).exists(Symlinks.NOFOLLOW)).isFalse();
   }
 
   @Test
@@ -977,10 +965,7 @@ public void createSymbolicLink_unresolvedSymlink() throws Exception {
     // assert
     assertThat(symlinkActionFs.getFileSystem()).isSameInstanceAs(actionFs);
     assertThat(symlinkActionFs.readSymbolicLink()).isEqualTo(targetPath);
-    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).readSymbolicLink())
-        .isEqualTo(targetPath);
-    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).readSymbolicLink())
-        .isEqualTo(targetPath);
+    assertThat(getLocalFileSystem(actionFs).getPath(linkPath).exists(Symlinks.NOFOLLOW)).isFalse();
   }
 
   @Test

src/test/shell/bazel/remote/build_without_the_bytes_test.sh

@@ -1580,14 +1580,14 @@ EOF
     --remote_download_minimal \
     //a:test0 >& $TEST_log || fail "Failed to test"
   # 2 remote spawns: 1 for executing the test, 1 for generating the test.xml
-  expect_log "\d processes:.* 2 remote"
+  expect_log ".* processes:.* 2 remote"
 
   bazel test \
     --remote_executor=grpc://localhost:${worker_port} \
     --remote_download_minimal \
     //a:test1 >& $TEST_log || fail "Failed to test"
   # only 1 remote spawn: test.xml is generated by junit
-  expect_log "\d processes:.* 1 remote"
+  expect_log ".* processes:.* 1 remote"
 }
 
 function test_output_file_permission() {