commit 2d9111bc52f373998bf5accc64aa41138a0d8f31
author Trent Apted <tapted@chromium.org> Fri Aug 04 16:20:35 2023 +1000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 07 23:06:38 2023 +0000
tree 72076e1a8f56f07d603a6026c996a9613ee11f65
parent 2d38031d261f500cab4942d6723b9e1f6cd44dd6

lib: move environment setting in cros_test_lib.TestCase to conftest.py

This ensures that pytest tests get the same environment, and also that
pytest tests that _set_ environment variables no longer have them
leaking into other test cases.

Follow-up to https://crrev.com/c/4617263/comment/444a85fc_5cc57e6f/

BUG=None
TEST=run_tests

Change-Id: Id4176dcc60b88b2b435490f8c6bf124360aadfc6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4750603
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Trent Apted <tapted@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>

scripts/build_sdk_subtools_unittest.py

diff --git a/scripts/build_sdk_subtools_unittest.py b/scripts/build_sdk_subtools_unittest.py
index 4c346e5..70922bd 100644
--- a/scripts/build_sdk_subtools_unittest.py
+++ b/scripts/build_sdk_subtools_unittest.py
@@ -4,7 +4,6 @@
 
 """Unit tests for build_sdk_subtools."""
 
-import os
 from pathlib import Path
 from unittest import mock
 
@@ -121,11 +120,7 @@
         returncode=42,
     )
 
-    # Avoid bots passing CROS_CACHEDIR via `sudo` and messing up cmd matching.
-    with mock.patch.dict("os.environ"):
-        os.environ.pop("CROS_CACHEDIR", None)
-        assert build_sdk_subtools.main() == 42
-
+    assert build_sdk_subtools.main() == 42
     assert run_mock.call_count == 2
     assert outside_chroot.called