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_unittest.py

diff --git a/api/controller/test_unittest.py b/api/controller/test_unittest.py
index f3525b9..c068c78 100644
--- a/api/controller/test_unittest.py
+++ b/api/controller/test_unittest.py
@@ -110,7 +110,7 @@
                 cache_dir=None,
                 empty_sysroot=None,
                 packages=None,
-                blacklist=None):
+                blocklist=None):
     """Helper to build an input message instance."""
     formatted_packages = []
     for pkg in packages or []:
@@ -118,16 +118,16 @@
           'category': pkg.category,
           'package_name': pkg.package
       })
-    formatted_blacklist = []
-    for pkg in blacklist or []:
-      formatted_blacklist.append({'category': pkg.category,
+    formatted_blocklist = []
+    for pkg in blocklist or []:
+      formatted_blocklist.append({'category': pkg.category,
                                   'package_name': pkg.package})
 
     return test_pb2.BuildTargetUnitTestRequest(
         build_target={'name': board}, result_path=result_path,
         chroot={'path': chroot_path, 'cache_dir': cache_dir},
         flags={'empty_sysroot': empty_sysroot},
-        package_blacklist=formatted_blacklist,
+        package_blacklist=formatted_blocklist,
     )
 
   def _GetOutput(self):
@@ -230,9 +230,9 @@
     self.PatchObject(test_service, 'BuildTargetUnitTest', return_value=result)
 
     pkgs = ['foo/bar', 'cat/pkg']
-    blacklist = [package_info.SplitCPV(p, strict=False) for p in pkgs]
+    blocklist = [package_info.SplitCPV(p, strict=False) for p in pkgs]
     input_msg = self._GetInput(board='board', result_path=self.tempdir,
-                               empty_sysroot=True, blacklist=blacklist)
+                               empty_sysroot=True, blocklist=blocklist)
     output_msg = self._GetOutput()
 
     rc = test_controller.BuildTargetUnitTest(input_msg, output_msg,