From af62411649fbfeab269b480ed9ce65d04dd571b3 Mon Sep 17 00:00:00 2001 From: vladmos Date: Fri, 25 Aug 2017 16:41:47 +0200 Subject: Make tests independent of the current state of the incompatible_descriptive_string_representations flag PiperOrigin-RevId: 166475260 --- .../devtools/build/lib/skylark/SkylarkRuleContextTest.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java') diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java index 7ab868ba66..b5bf2b8698 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java @@ -498,6 +498,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { @Test public void existingRuleWithSelect() throws Exception { + setSkylarkSemanticsOptions("--incompatible_descriptive_string_representations=true"); scratch.file( "test/existing_rule.bzl", "def macro():", @@ -510,7 +511,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { "macro()", "cc_library(name = 'a', srcs = [])"); getConfiguredTarget("//test:a"); - assertContainsEvent("selector({\"//foo:foo\": [\"//bar:bar\"]})"); + assertContainsEvent("select({Label(\"//foo:foo\"): [Label(\"//bar:bar\")]})"); } @Test @@ -669,13 +670,6 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { assertThat(((Artifact) Iterables.getOnlyElement(result)).getFilename()).isEqualTo("d.txt"); } - @Test - public void testSkylarkRuleContextStr() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); - Object result = evalRuleContextCode(ruleContext, "'%s' % ruleContext"); - assertThat(result).isEqualTo("//foo:foo"); - } - @Test public void testSkylarkRuleContextGetDefaultShellEnv() throws Exception { SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); -- cgit v1.2.3