commit 337b5f687f53d4bca0dfd1d41488a9ad8fe47cc9
author Artem Sumaneev <asumaneev@google.com> Tue Feb 28 15:38:58 2023 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Mar 02 14:29:20 2023 +0000
tree f3a3a46c41f12880ad35d39b9f7d59509c92715b
parent a0b614ae69d8050611587017b52652a22b9f0bfb

lib, scripts: Preserve features env for unit tests.

Before the change, running cros_run_unit_tests with custom FEATURES
variable resulted in FEATURES being overridden with FEATURES=test in
chroot_util.RunUnittests.

Now chroot_util preserves incoming features if any and appends test to
it. So that it's possible to run unit tests like:

FEATURES=noclean cros_run_unit_tests --board "${BOARD}"

noclean feature will be preserved and copied sources won't be removed.

Also run cros format on chroot_util_unittest.py.

BUG=b:269132220
TEST=run_tests scripts/cros_run_unit_tests_unittest.py
TEST=run_tests lib/chroot_util_unittest.py

Change-Id: Ifc58219a9e5c05a98eef123c487fdcaeabe01ed7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4295118
Commit-Queue: Artem Sumaneev <asumaneev@google.com>
Tested-by: Artem Sumaneev <asumaneev@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_run_unit_tests.py

diff --git a/scripts/cros_run_unit_tests.py b/scripts/cros_run_unit_tests.py
index 30ce627..e14714d 100644
--- a/scripts/cros_run_unit_tests.py
+++ b/scripts/cros_run_unit_tests.py
@@ -215,6 +215,10 @@
         use_flags += " -cros-debug"
         env["USE"] = use_flags
 
+    features_flags = os.environ.get("FEATURES", "")
+    if features_flags:
+        env["FEATURES"] = features_flags
+
     keep_going = get_keep_going()
 
     metrics_dir = os.environ.get(constants.CROS_METRICS_DIR_ENVVAR)