Skip to content

stop assuming default target provider fields in tests #26297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dws wants to merge 1 commit into from
Closed

stop assuming default target provider fields in tests #26297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2226,7 +2226,7 @@ public void testDependencyActionsProvider() throws Exception {

Map<?, ?> mapping = (Dict<?, ?>) ev.eval("actions.by_file");
assertThat(mapping).hasSize(1);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
Object actionUnchecked = ev.eval("actions.by_file[file]");
assertThat(actionUnchecked).isInstanceOf(ActionAnalysisMetadata.class);
}
Expand Down Expand Up @@ -2372,7 +2372,7 @@ public void testSpawnActionInterface() throws Exception {
scratch.file("test/BUILD", simpleBuildDefinition);
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

assertThat(ev.eval("type(action)")).isEqualTo("Action");
Expand Down Expand Up @@ -2512,7 +2512,7 @@ public void testFileWriteActionInterface() throws Exception {
scratch.file("test/BUILD", simpleBuildDefinition);
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

assertThat(ev.eval("type(action)")).isEqualTo("Action");
Expand All @@ -2534,7 +2534,7 @@ public void testFileWriteActionInterfaceWithArgs() throws Exception {
scratch.file("test/BUILD", simpleBuildDefinition);
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

assertThat(ev.eval("type(action)")).isEqualTo("Action");
Expand Down Expand Up @@ -2562,7 +2562,7 @@ public void testFileWriteActionInterfaceWithArgsContainingTreeArtifact() throws
scratch.file("test/BUILD", simpleBuildDefinition);
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

assertThat(ev.eval("type(action)")).isEqualTo("Action");
Expand All @@ -2585,7 +2585,7 @@ public void testFileWriteActionInterfaceWithArgsExpansionError() throws Exceptio
scratch.file("test/BUILD", simpleBuildDefinition);
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

assertThat(ev.eval("type(action)")).isEqualTo("Action");
Expand Down Expand Up @@ -2679,7 +2679,7 @@ public void testArgsMapEachFunctionAllowClosure() throws Exception {
scratch.file("test/BUILD", simpleBuildDefinition);
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

Object contentUnchecked = ev.eval("action.content");
Expand Down Expand Up @@ -2755,7 +2755,7 @@ public void testTemplateExpansionActionInterface() throws Exception {
""");
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

assertThat(ev.eval("type(action)")).isEqualTo("Action");
Expand Down Expand Up @@ -3711,7 +3711,7 @@ public void testTemplateExpansionComputedSubstitution() throws Exception {
""");
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

assertThat(ev.eval("type(action)")).isEqualTo("Action");
Expand Down Expand Up @@ -3775,7 +3775,7 @@ public void testTemplateExpansionComputedSubstitutionWithUniquify() throws Excep
""");
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

assertThat(ev.eval("type(action)")).isEqualTo("Action");
Expand Down Expand Up @@ -3836,7 +3836,7 @@ public void testTemplateExpansionComputedSubstitutionWithUniquifyAndListMapEach(
""");
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

assertThat(ev.eval("type(action)")).isEqualTo("Action");
Expand Down Expand Up @@ -3924,7 +3924,7 @@ public void testTemplateExpansionComputedSubstitutionNoParamMapEach() throws Exc
""");
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

EvalException evalException =
Expand Down Expand Up @@ -3973,7 +3973,7 @@ public void testTemplateExpansionComputedSubstitutionTwoParamMapEach() throws Ex
""");
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

EvalException evalException =
Expand Down Expand Up @@ -4022,7 +4022,7 @@ public void testTemplateExpansionComputedSubstitutionMapEachBadReturnType() thro
""");
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

EvalException evalException =
Expand Down Expand Up @@ -4074,7 +4074,7 @@ public void testTemplateExpansionComputedSubstitutionMapEachBadListReturnType()
""");
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
setRuleContext(ruleContext);
ev.update("file", ev.eval("ruleContext.attr.dep.files.to_list()[0]"));
ev.update("file", ev.eval("ruleContext.attr.dep[DefaultInfo].files.to_list()[0]"));
ev.update("action", ev.eval("ruleContext.attr.dep[Actions].by_file[file]"));

EvalException evalException =
Expand Down
4 changes: 2 additions & 2 deletions .../java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,8 +895,8 @@ public void testResolveCommandExpandLocations() throws Exception {
" label_dict = {}",
" all = []",
" for dep in ruleContext.attr.srcs + ruleContext.attr.tools:",
" all.extend(dep.files.to_list())",
" label_dict[dep.label] = dep.files.to_list()",
" all.extend(dep[DefaultInfo].files.to_list())",
" label_dict[dep.label] = dep[DefaultInfo].files.to_list()",
" return ruleContext.resolve_command(",
" command='A$(locations //foo:mytool) B$(location //foo:file3.dat)',",
" attribute='cmd', expand_locations=True, label_dict=label_dict)",
Expand Down
4 changes: 2 additions & 2 deletions src/test/shell/integration/configured_query_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ EOF
assert_contains "//$pkg:pylibtwo" output

bazel cquery "//$pkg:all" --output=starlark \
--starlark:expr="str(target.label) + '%' + str(target.files.to_list()[1].is_directory)" \
--starlark:expr="str(target.label) + '%' + str(providers(target)['DefaultInfo'].files.to_list()[1].is_directory)" \
> output 2>"$TEST_log" || fail "Expected success"

assert_contains "//$pkg:pylibtwo%False" output
Expand Down Expand Up @@ -1251,7 +1251,7 @@ cc_library(
EOF

bazel cquery "//$pkg:all" --output=starlark \
--starlark:expr="' '.join([f.basename for f in target.files.to_list()])" \
--starlark:expr="' '.join([f.basename for f in providers(target)['DefaultInfo'].files.to_list()])" \
> output 2>"$TEST_log" || fail "Expected failure"

if "$is_windows"; then
Expand Down
2 changes: 1 addition & 1 deletion src/test/shell/integration/discard_analysis_cache_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function test_aspect_and_configured_target_cleared() {
AspectInfo = provider()
def _simple_aspect_impl(target, ctx):
result=[]
for orig_out in target.files.to_list():
for orig_out in target[DefaultInfo].files.to_list():
aspect_out = ctx.actions.declare_file(orig_out.basename + ".aspect")
ctx.actions.write(
output=aspect_out,
Expand Down
2 changes: 1 addition & 1 deletion src/test/shell/integration/discard_graph_edges_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function test_top_level_aspect() {
AspectInfo = provider()
def _simple_aspect_impl(target, ctx):
result=[]
for orig_out in target.files.to_list():
for orig_out in target[DefaultInfo].files.to_list():
aspect_out = ctx.actions.declare_file(orig_out.basename + ".aspect")
ctx.actions.write(
output=aspect_out,
Expand Down
Loading