commit 5861310e2055de37bfd7762ff3068680b537f730
author nharmata <nharmata@google.com> Thu Oct 11 15:10:04 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Thu Oct 11 15:12:28 2018 -0700
tree 122a9e38bbf848115fa4cc7d1629210ad0845358
parent bee7045eef02a9edbed36265f3eec4daf22f6e65

Remove code that's dead because FileSymlinkException can never get propagated from ContainingPackageLookupValue.

RELNOTES: None
PiperOrigin-RevId: 216768770

src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
index 6255bc8..8205cc3 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
@@ -15,6 +15,7 @@
 package com.google.devtools.build.lib.skyframe;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.skyframe.EvaluationResultSubjectFactory.assertThatEvaluationResult;
 import static org.junit.Assert.fail;
 
 import com.google.common.base.Optional;
@@ -28,6 +29,7 @@
 import com.google.devtools.build.lib.clock.BlazeClock;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
+import com.google.devtools.build.lib.packages.BuildFileNotFoundException;
 import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
 import com.google.devtools.build.lib.packages.NoSuchTargetException;
@@ -730,6 +732,49 @@
     assertThat(errorInfo.getException()).hasCauseThat().isInstanceOf(IOException.class);
   }
 
+  @Test
+  public void testLabelsCrossesSubpackageBoundaries() throws Exception {
+    reporter.removeHandler(failFastHandler);
+
+    scratch.file("pkg/BUILD", "exports_files(['sub/blah'])");
+    scratch.file("pkg/sub/BUILD");
+    invalidatePackages();
+
+    SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//pkg"));
+    EvaluationResult<PackageValue> result = SkyframeExecutorTestUtils.evaluate(
+        getSkyframeExecutor(), skyKey, /*keepGoing=*/false, reporter);
+    assertThatEvaluationResult(result).hasNoError();
+    assertThat(result.get(skyKey).getPackage().containsErrors()).isTrue();
+    assertContainsEvent("Label '//pkg:sub/blah' crosses boundary of subpackage 'pkg/sub'");
+  }
+
+  @Test
+  public void testSymlinkCycleEncounteredWhileHandlingLabelCrossingSubpackageBoundaries()
+      throws Exception {
+    reporter.removeHandler(failFastHandler);
+
+    scratch.file("pkg/BUILD", "exports_files(['sub/blah'])");
+    Path subBuildFilePath = scratch.dir("pkg/sub").getChild("BUILD");
+    FileSystemUtils.ensureSymbolicLink(subBuildFilePath, subBuildFilePath);
+    invalidatePackages();
+
+    SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//pkg"));
+    EvaluationResult<PackageValue> result = SkyframeExecutorTestUtils.evaluate(
+        getSkyframeExecutor(), skyKey, /*keepGoing=*/false, reporter);
+    assertThatEvaluationResult(result).hasError();
+    assertThatEvaluationResult(result)
+        .hasErrorEntryForKeyThat(skyKey)
+        .hasExceptionThat()
+        .isInstanceOf(BuildFileNotFoundException.class);
+    assertThatEvaluationResult(result)
+        .hasErrorEntryForKeyThat(skyKey)
+        .hasExceptionThat()
+        .hasMessageThat()
+        .contains(
+            "no such package 'pkg/sub': Symlink cycle detected while trying to find BUILD file");
+    assertContainsEvent("circular symlinks detected");
+  }
+
   private static class CustomInMemoryFs extends InMemoryFileSystem {
     private abstract static class FileStatusOrException {
       abstract FileStatus get() throws IOException;