commit 2712b4002d181880cdfdb5bd1818b4d273231ac6
author Brian Norris <briannorris@chromium.org> Mon May 01 18:31:45 2023 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 03 19:23:03 2023 +0000
tree d592ea6d466d171a171651dc5ae8f2eccbee311c
parent 67374d84e25acc22d3f98f3631c5accb20821549

api: router: Set out_path for unit tests

api/router tests were specifying a chroot path but not an out path; this
passed tests when the default out path (SOURCE_ROOT / "out") exist, but
was doing unexpected things (like touching files outside of the intended
temporary directories).

Specify the output directory, and don't assume where "tmp" is -- let
chroot_lib resolve that.

BUG=b:265885353
TEST=./run_tests, without $SOURCE_ROOT/out/ existing

Change-Id: Iffdbcbb1224a12b76436fce272e65d8614bdf446
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4497258
Tested-by: Brian Norris <briannorris@chromium.org>
Commit-Queue: Brian Norris <briannorris@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>

api/router_unittest.py

diff --git a/api/router_unittest.py b/api/router_unittest.py
index 4877941..5fc60e2 100644
--- a/api/router_unittest.py
+++ b/api/router_unittest.py
@@ -29,10 +29,19 @@
         self.router = router.Router()
         self.router.Register(build_api_test_pb2)
 
-        self.chroot_dir = os.path.join(self.tempdir, "chroot")
-        chroot_tmp = os.path.join(self.chroot_dir, "tmp")
+        self.PatchObject(cros_build_lib, "IsInsideChroot", return_value=False)
+
+        self.chroot_dir = self.tempdir / "chroot"
+        self.out_dir = self.tempdir / "out"
+        chroot = chroot_lib.Chroot(
+            path=self.chroot_dir,
+            out_path=self.out_dir,
+        )
+        # Make sure basic path structures exist.
+        osutils.SafeMakedirs(self.chroot_dir)
+        osutils.SafeMakedirs(self.out_dir)
         # Make the tmp dir for the re-exec inside chroot input/output files.
-        osutils.SafeMakedirs(chroot_tmp)
+        osutils.SafeMakedirs(chroot.tmp)
 
         # Build the input/output/config paths we'll be using in the tests.
         self.json_input_file = os.path.join(self.tempdir, "input.json")
@@ -66,7 +75,8 @@
         self.expected_id = "input id"
         input_msg = build_api_test_pb2.TestRequestMessage()
         input_msg.id = self.expected_id
-        input_msg.chroot.path = self.chroot_dir
+        input_msg.chroot.path = str(self.chroot_dir)
+        input_msg.chroot.out_path = str(self.out_dir)
 
         # Write out base input and config messages.
         osutils.WriteFile(