Rollback of commit 19db71413329da3f5d22b5fc7681471f3d971d88.

--
MOS_MIGRATED_REVID=132058819

2 files changed, 14 insertions, 12 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 1426ea58fc..9f4514cd94 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -858,11 +858,12 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
       getTarget(target);
       fail(
           String.format(
-              "checkLoadingPhaseError(): expected an exception with '%s' when loading target '%s'.",
-              expectedErrorMessage, target));
-    } catch (Exception expected) {
+              "checkLoadingPhaseError(): expected an error with '%s' when loading target '%s'.",
+              expectedErrorMessage,
+              target));
+    } catch (Exception e) {
+      assertContainsEvent(expectedErrorMessage);
     }
-    assertContainsEvent(expectedErrorMessage);
   }
 
   /**
diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
index 03fbd31bda..24965818f0 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
@@ -48,7 +48,6 @@ import com.google.devtools.build.lib.events.EventCollector;
 import com.google.devtools.build.lib.events.EventKind;
 import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.events.Location.LineAndColumn;
-import com.google.devtools.build.lib.packages.Attribute.SkylarkComputedDefaultTemplate.CannotPrecomputeDefaultsException;
 import com.google.devtools.build.lib.packages.Attribute.ValidityPredicate;
 import com.google.devtools.build.lib.packages.ConfigurationFragmentPolicy.MissingFragmentPolicy;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
@@ -60,6 +59,12 @@ import com.google.devtools.build.lib.syntax.BaseFunction;
 import com.google.devtools.build.lib.syntax.Environment;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.vfs.Path;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -70,11 +75,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.annotation.Nullable;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Tests for {@link RuleClass}.
@@ -770,9 +772,8 @@ public class RuleClassTest extends PackageLoadingTestCase {
                  attributes.get("my-sorted-stringlist-attr", Type.STRING_LIST));
   }
 
-  private Rule createRule(
-      RuleClass ruleClass, String name, Map<String, Object> attributeValues, Location location)
-      throws LabelSyntaxException, InterruptedException, CannotPrecomputeDefaultsException {
+  private Rule createRule(RuleClass ruleClass, String name, Map<String, Object> attributeValues,
+      Location location) throws LabelSyntaxException, InterruptedException {
     Package.Builder pkgBuilder = createDummyPackageBuilder();
     Label ruleLabel;
     try {