commit b64e5f8d364c25786f6b071de1c0324543884797
author Alex Klein <saklein@chromium.org> Wed Sep 23 10:55:31 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Fri Sep 25 01:54:10 2020 +0000
tree aac53af70446e75d3b63aa5193e9d5c3f6900038
parent c4283bc5171df4096b4dbb4531b0d4d4b72dd5f0

Test/BuildTargetUnitTest: Begin blocklist language transition.

Change out blacklist for blocklist for more inclusive language.
Left instances that align with calling code until we're able to
make a full transition.

BUG=None
TEST=./run_pytest

Cq-Depend: chromium:2426695
Change-Id: Id9d5bf18a2679c31658b48b04c27097ec32c3d26
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2426824
Tested-by: Alex Klein <saklein@chromium.org>
Auto-Submit: Alex Klein <saklein@chromium.org>
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Alex Klein <saklein@chromium.org>

api/controller/test.py

diff --git a/api/controller/test.py b/api/controller/test.py
index 0c63c23..9427dba 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -101,10 +101,12 @@
     packages.append(controller_util.PackageInfoToString(package_info_msg))
 
   # Skipped tests.
-  blacklisted_package_info = input_proto.package_blacklist
-  blacklist = []
-  for package_info_msg in blacklisted_package_info:
-    blacklist.append(controller_util.PackageInfoToString(package_info_msg))
+  # TODO: Remove blacklist when we fully switch to blocklist.
+  blocklisted_package_info = (
+      input_proto.package_blacklist or input_proto.package_blocklist)
+  blocklist = []
+  for package_info_msg in blocklisted_package_info:
+    blocklist.append(controller_util.PackageInfoToString(package_info_msg))
 
   # Allow call to succeed if no tests were found.
   testable_packages_optional = input_proto.flags.testable_packages_optional
@@ -118,7 +120,7 @@
       build_target,
       chroot,
       packages=packages,
-      blacklist=blacklist,
+      blocklist=blocklist,
       was_built=was_built,
       code_coverage=code_coverage,
       testable_packages_optional=testable_packages_optional)