commit a4e46285abc15710c0417a452bb4345fb1aebb59
author Brian Norris <briannorris@chromium.org> Fri Jun 30 11:35:19 2023 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jun 30 22:58:37 2023 +0000
tree d0e8f4125ae7a4756a5418c7d0d1df1068d9a3d2
parent 41f247b8650c5a80d97411daeaf724e0615e6a4c

service: test: Use chroot_lib for path translation

BUG=b:191307774
TEST=./run_tests

Change-Id: I52cc8dee2996b33b0f063b8da3280623dbdbc30e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4661951
Tested-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Greg Edelston <gredelston@google.com>
Commit-Queue: Brian Norris <briannorris@chromium.org>

api/controller/test_unittest.py

diff --git a/api/controller/test_unittest.py b/api/controller/test_unittest.py
index 543b666..bd30ce9 100644
--- a/api/controller/test_unittest.py
+++ b/api/controller/test_unittest.py
@@ -827,12 +827,15 @@
 
     def setUp(self):
         """Set up the class for tests."""
-        chroot_dir = os.path.join(self.tempdir, "chroot")
-        osutils.SafeMakedirs(chroot_dir)
-        osutils.SafeMakedirs(os.path.join(chroot_dir, "tmp"))
-        self.chroot = chroot_lib.Chroot(chroot_dir)
+        self.PatchObject(cros_build_lib, "IsInsideChroot", return_value=False)
 
-        sysroot_path = os.path.join(chroot_dir, "build", "board")
+        self.chroot = chroot_lib.Chroot(
+            path=self.tempdir / "chroot",
+            out_path=self.tempdir / "out",
+        )
+        osutils.SafeMakedirs(self.chroot.tmp)
+
+        sysroot_path = self.chroot.full_path("/build/board")
         osutils.SafeMakedirs(sysroot_path)
         self.sysroot = sysroot_lib.Sysroot(sysroot_path)