commit 63c7ea60c01e3ee74d650e457cbe02ef965939ee
author laurentlb <laurentlb@google.com> Thu Apr 25 08:45:21 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Apr 25 08:46:48 2019 -0700
tree 821c3bc798399491cd49f1d7be0a1e924da7e661
parent 861a7e1f8f57f1eb45820ccce4a13eb20d86c291

Update tests to avoid depset union.

Progress towards https://github.com/bazelbuild/bazel/issues/5817

RELNOTES: None.
PiperOrigin-RevId: 245242309

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 1cd50c0..12a789a 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
@@ -1496,7 +1496,7 @@
 
   @Test
   public void testUnionSet() throws Exception {
-    new SkylarkTest()
+    new SkylarkTest("--incompatible_depset_union=false")
         .testStatement("str(depset([1, 3]) | depset([1, 2]))", "depset([1, 2, 3])")
         .testStatement("str(depset([1, 2]) | [1, 3])", "depset([1, 2, 3])")
         .testIfExactError("unsupported operand type(s) for |: 'int' and 'int'", "2 | 4");