commit 67ba1d68e5276b35e03b19cdf70096bca2b67ec2
author laurentlb <laurentlb@google.com> Mon Jun 03 07:58:51 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jun 03 07:59:43 2019 -0700
tree 3aa6b3b4c4fdd4309df96cbca665992598778edc
parent 45743d0fa66ad8e0aacf258df88834027b6bd235

Update tests in preparation for incompatible_depset_is_not_iterable flag flip

RELNOTES: None.
PiperOrigin-RevId: 251231930

src/test/java/com/google/devtools/build/lib/blackbox/tests/manageddirs/test_rule.bzl

diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/tests/manageddirs/test_rule.bzl b/src/test/java/com/google/devtools/build/lib/blackbox/tests/manageddirs/test_rule.bzl
index 02c57aa..bd0ca74 100644
--- a/src/test/java/com/google/devtools/build/lib/blackbox/tests/manageddirs/test_rule.bzl
+++ b/src/test/java/com/google/devtools/build/lib/blackbox/tests/manageddirs/test_rule.bzl
@@ -18,7 +18,7 @@
     out = ctx.actions.declare_file("out.txt")
     files = ctx.attr.module_source.files
     found = False
-    for file_ in files:
+    for file_ in files.to_list():
         if file_.basename == "package.json":
             compare_version(ctx.actions, file_, out, ctx.attr.version)
             found = True

src/test/shell/bazel/workspace_test.sh

diff --git a/src/test/shell/bazel/workspace_test.sh b/src/test/shell/bazel/workspace_test.sh
index dc5c9c1..fe53406 100755
--- a/src/test/shell/bazel/workspace_test.sh
+++ b/src/test/shell/bazel/workspace_test.sh
@@ -673,7 +673,7 @@
   if hasattr(ctx.rule.attr, 'srcs'):
     # Output '1' for each file in srcs.
     for src in ctx.rule.attr.srcs:
-      for f in src.files:
+      for f in src.files.to_list():
         print(1)
   return []
 

tools/build_rules/java_rules_skylark.bzl

diff --git a/tools/build_rules/java_rules_skylark.bzl b/tools/build_rules/java_rules_skylark.bzl
index 5bc76a5..f3c5fa1 100644
--- a/tools/build_rules/java_rules_skylark.bzl
+++ b/tools/build_rules/java_rules_skylark.bzl
@@ -120,14 +120,14 @@
 
     # Cleaning build output directory
     cmd = "set -e;rm -rf " + build_output + ";mkdir " + build_output + "\n"
-    for jar in library_result[1].runtime_jars:
+    for jar in library_result[1].runtime_jars.to_list():
         cmd += "unzip -qn " + jar.path + " -d " + build_output + "\n"
     cmd += (jar_path + " cmf " + manifest.path + " " +
             deploy_jar.path + " -C " + build_output + " .\n" +
             "touch " + build_output + "\n")
 
     ctx.actions.run_shell(
-        inputs = list(library_result[1].runtime_jars) + [manifest] + ctx.files._jdk,
+        inputs = library_result[1].runtime_jars.to_list() + [manifest] + ctx.files._jdk,
         outputs = [deploy_jar],
         mnemonic = "Deployjar",
         command = cmd,