1 files changed, 2 insertions, 20 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java
index 5771f522d9..13951591c1 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java
@@ -33,7 +33,6 @@ import com.google.devtools.build.lib.events.EventCollector;
 import com.google.devtools.build.lib.events.EventKind;
 import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
 import com.google.devtools.build.lib.packages.NoSuchThingException;
-import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.packages.PackageFactory;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.packages.util.PackageLoadingTestCase;
@@ -121,8 +120,7 @@ abstract public class SkyframeLabelVisitorTestCase extends PackageLoadingTestCas
    * Check that the expected targets were exactly those visited, and that the packages of these
    * expected targets were exactly those packages visited.
    */
-  protected void assertExpectedTargets(
-      Set<String> expectedLabels, boolean expectError, Set<Target> startingTargets)
+  protected void assertExpectedTargets(Set<String> expectedLabels, Set<Target> startingTargets)
       throws Exception {
     Set<Label> visitedLabels =
         getVisitedLabels(
@@ -143,13 +141,6 @@ abstract public class SkyframeLabelVisitorTestCase extends PackageLoadingTestCas
     }
 
     assertEquals(expectedPkgs, getVisitedPackageNames(startingTargets));
-    if (!expectError) {
-      Set<PathFragment> visitedPkgs = new HashSet<>();
-      for (Package pkg : getErrorFreeVisitedPackages(startingTargets)) {
-        visitedPkgs.add(pkg.getNameFragment());
-      }
-      assertEquals(expectedPkgs, visitedPkgs);
-    }
   }
 
   /**
@@ -176,7 +167,7 @@ abstract public class SkyframeLabelVisitorTestCase extends PackageLoadingTestCas
             reporter, startingTargets, ImmutableSet.<Label>of(), keepGoing, 200, Integer.MAX_VALUE);
 
     assertNotSame(expectError, result);
-    assertExpectedTargets(expectedLabels, expectError, startingTargets);
+    assertExpectedTargets(expectedLabels, startingTargets);
   }
 
   /**
@@ -286,15 +277,6 @@ abstract public class SkyframeLabelVisitorTestCase extends PackageLoadingTestCas
     return builder.build();
   }
 
-  protected Set<Package> getErrorFreeVisitedPackages(Set<Target> startingTargets) {
-    ImmutableSet.Builder<Package> builder = ImmutableSet.builder();
-    builder.addAll(visitor.getErrorFreeVisitedPackages(reporter));
-    for (Target target : startingTargets) {
-      builder.add(target.getPackage());
-    }
-    return builder.build();
-  }
-
   @Before
   public final void initializeVisitor() throws Exception {
     skyframeExecutor = super.createSkyframeExecutor(