commit 09937019f1638d61a69bab7053699c8b44428428
author Brian Norris <briannorris@chromium.org> Fri Mar 31 15:16:55 2023 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 04 20:11:27 2023 +0000
tree 2f877b845819bf190a2c05674641032815cc7180
parent 78ff85837118a6ba7980a76edb05cccbf06b8f41

api: controller: Plumb chroot.out_path in tests

Fix some typing while we're at it, since protobufs want strings, but
chroot_lib wants Path.

BUG=b:265885353
TEST=./run_tests

Change-Id: I26cfe5141af8f94c5db18e9f5bbd061b6c111895
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4391049
Tested-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Sergey Frolov <sfrolov@google.com>
Commit-Queue: Brian Norris <briannorris@chromium.org>

api/controller/artifacts_unittest.py

diff --git a/api/controller/artifacts_unittest.py b/api/controller/artifacts_unittest.py
index 15ec2c1..082a799 100644
--- a/api/controller/artifacts_unittest.py
+++ b/api/controller/artifacts_unittest.py
@@ -49,7 +49,12 @@
         return request
 
     def SysrootRequest(
-        self, sysroot=None, build_target=None, output_dir=None, chroot=None
+        self,
+        sysroot=None,
+        build_target=None,
+        output_dir=None,
+        chroot=None,
+        chroot_out=None,
     ):
         """Get a sysroot format request instance."""
         request = self.EmptyRequest()
@@ -60,7 +65,9 @@
         if output_dir:
             request.output_dir = output_dir
         if chroot:
-            request.chroot.path = chroot
+            request.chroot.path = str(chroot)
+        if chroot_out:
+            request.chroot.out_path = str(chroot_out)
 
         return request
 
@@ -78,7 +85,8 @@
         osutils.SafeMakedirs(self.output_dir)
         self.sysroot_path = "/build/target"
         self.sysroot = sysroot_lib.Sysroot(self.sysroot_path)
-        self.chroot_path = os.path.join(self.tempdir, "chroot")
+        self.chroot_path = self.tempdir / "chroot"
+        self.chroot_out_path = self.tempdir / "out"
         full_sysroot_path = os.path.join(
             self.chroot_path, self.sysroot_path.lstrip(os.sep)
         )
@@ -91,7 +99,7 @@
         self.target_request = self.BuildTargetRequest(
             build_target="target",
             output_dir=self.output_dir,
-            chroot=self.chroot_path,
+            chroot=str(self.chroot_path),
         )
 
         # Sysroot request.
@@ -100,6 +108,7 @@
             build_target="target",
             output_dir=self.output_dir,
             chroot=self.chroot_path,
+            chroot_out=self.chroot_out_path,
         )
 
         self.source_root = self.tempdir
@@ -347,7 +356,9 @@
 
     def testBundleTastFiles(self):
         """BundleTastFiles calls service correctly."""
-        chroot = chroot_lib.Chroot(self.chroot_path)
+        chroot = chroot_lib.Chroot(
+            self.chroot_path, out_path=self.chroot_out_path
+        )
 
         expected_archive = os.path.join(
             self.output_dir, artifacts_svc.TAST_BUNDLE_NAME