commit e5d95fb510ae056c8650b5bb450ec5dc7c7eeb3b
author brandjon <brandjon@google.com> Thu Jul 13 17:23:09 2017 +0200
committer László Csomor <laszlocsomor@google.com> Fri Jul 14 10:51:40 2017 +0200
tree ed7e8978345c4172738a383ad614d7ad3bbb44b6
parent 528a1eac7d2638a492655cda8e18e80c4510583c

Fix crash when unioning depsets with different orders

Also refactor FAIL_FAST_HANDLER to throw something more specific than IllegalArgumentException. This bug was masked because the test assertion that would've caught it considered IllegalArgumentException to be an expected error, the same as EvalException.

RELNOTES: None
PiperOrigin-RevId: 161809957

src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
index 1cd8a98..c9b8d1c 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -635,7 +635,7 @@
   private void flowStatementInsideFunction(String statement) throws Exception {
     checkEvalErrorContains(statement + " statement must be inside a for loop",
         "def foo():",
-        "  " + statement + "",
+        "  " + statement,
         "x = foo()");
   }
 
@@ -644,7 +644,7 @@
         "def foo2():",
         "   for i in range(0, 3):",
         "      pass",
-        "   " + statement + "",
+        "   " + statement,
         "y = foo2()");
   }