commit 3dd314b7a242340061e6c3613248bee51a552bef
author Googler <noreply@google.com> Wed Feb 05 02:47:58 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Feb 05 02:48:55 2020 -0800
tree 00b8787c0fb59581f8ffcb103c4cf899576aee04
parent 250647bc89d5bb42fa2456b2b497fb254c775861

Fix a deficiency in WorkerExecRootTest

The test should've simulated the existence of files in exec root
not the workspace dir. This meant the test did not check whether
old symlinks get removed (although it did correctly check the
creation of requested symlinks)

The change also adds an additional test to make sure we do not
delete files in the workspace directory.

RELNOTES: None.
PiperOrigin-RevId: 293330213

src/test/java/com/google/devtools/build/lib/worker/WorkerExecRootTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/worker/WorkerExecRootTest.java b/src/test/java/com/google/devtools/build/lib/worker/WorkerExecRootTest.java
index 214d863..2654014 100644
--- a/src/test/java/com/google/devtools/build/lib/worker/WorkerExecRootTest.java
+++ b/src/test/java/com/google/devtools/build/lib/worker/WorkerExecRootTest.java
@@ -92,11 +92,11 @@
 
   @Test
   public void createsAndCleansInputSymlinks() throws Exception {
-    FileSystemUtils.ensureSymbolicLink(
-        workspaceDir.getRelative("dir/input_symlink_1"), "old_content");
-    FileSystemUtils.ensureSymbolicLink(
-        workspaceDir.getRelative("dir/input_symlink_2"), "unchanged");
-    FileSystemUtils.ensureSymbolicLink(workspaceDir.getRelative("dir/input_symlink_3"), "whatever");
+    // Simulate existing symlinks in the exec root to check that `WorkerExecRoot` correctly deletes
+    // the unnecessary ones and updates the ones that don't point to the right target.
+    FileSystemUtils.ensureSymbolicLink(execRoot.getRelative("dir/input_symlink_1"), "old_content");
+    FileSystemUtils.ensureSymbolicLink(execRoot.getRelative("dir/input_symlink_2"), "unchanged");
+    FileSystemUtils.ensureSymbolicLink(execRoot.getRelative("dir/input_symlink_3"), "whatever");
 
     WorkerExecRoot workerExecRoot =
         new WorkerExecRoot(
@@ -119,4 +119,39 @@
         .isEqualTo(PathFragment.create("unchanged"));
     assertThat(execRoot.getRelative("dir/input_symlink_3").exists()).isFalse();
   }
+
+  @Test
+  public void workspaceFilesAreNotDeleted() throws Exception {
+    // We want to check that `WorkerExecRoot` deletes pre-existing symlinks if they're not in the
+    // `SandboxInputs`, but it does not delete the files that the symlinks point to (i.e., the files
+    // in the workspace directory).
+
+    Path neededWorkspaceFile = workspaceDir.getRelative("needed_file");
+    FileSystemUtils.writeContentAsLatin1(neededWorkspaceFile, "needed workspace content");
+
+    Path otherWorkspaceFile = workspaceDir.getRelative("other_file");
+    FileSystemUtils.writeContentAsLatin1(otherWorkspaceFile, "other workspace content");
+
+    FileSystemUtils.ensureSymbolicLink(execRoot.getRelative("needed_file"), neededWorkspaceFile);
+    FileSystemUtils.ensureSymbolicLink(execRoot.getRelative("other_file"), otherWorkspaceFile);
+
+    WorkerExecRoot workerExecRoot =
+        new WorkerExecRoot(
+            execRoot,
+            new SandboxInputs(
+                ImmutableMap.of(PathFragment.create("needed_file"), neededWorkspaceFile),
+                ImmutableMap.of()),
+            SandboxOutputs.create(ImmutableSet.of(), ImmutableSet.of()),
+            ImmutableSet.of());
+    workerExecRoot.createFileSystem();
+
+    assertThat(execRoot.getRelative("needed_file").readSymbolicLink())
+        .isEqualTo(neededWorkspaceFile.asFragment());
+    assertThat(execRoot.getRelative("other_file").exists()).isFalse();
+
+    assertThat(FileSystemUtils.readContent(neededWorkspaceFile, Charset.defaultCharset()))
+        .isEqualTo("needed workspace content");
+    assertThat(FileSystemUtils.readContent(otherWorkspaceFile, Charset.defaultCharset()))
+        .isEqualTo("other workspace content");
+  }
 }