commit e1c4d4bf70acb7b0fcd7c92fbed2ee20bbeb3aec
author Alex Klein <saklein@chromium.org> Wed Jan 05 14:51:04 2022 -0700
committer Commit Bot <commit-bot@chromium.org> Fri Jan 07 19:50:51 2022 +0000
tree 218fb76f80cc47eaa5631e19b50184e8d65e9651
parent 05d666b3c4a2e61dbb86792b4c090ef75c048015

controller/sysroot_unittest: Write logs to tempdir

Move test logs to the test's tempdir rather than relying on
/var/log/portage.

BUG=b:211915472
TEST=./run_tests

Change-Id: If466467feb09f8a69b3c0b283f564b94c53d1c5d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3368666
Tested-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Lizzy Presland <zland@google.com>
Commit-Queue: Alex Klein <saklein@chromium.org>

api/controller/sysroot_unittest.py

diff --git a/api/controller/sysroot_unittest.py b/api/controller/sysroot_unittest.py
index e03c95a..906bf24 100644
--- a/api/controller/sysroot_unittest.py
+++ b/api/controller/sysroot_unittest.py
@@ -249,7 +249,9 @@
     osutils.SafeMakedirs(self.sysroot)
     # Set up portage log directory.
     self.target_sysroot = sysroot_lib.Sysroot(self.sysroot)
-    self.portage_dir = self.target_sysroot.portage_logdir
+    self.portage_dir = os.path.join(self.tempdir, 'portage_logdir')
+    self.PatchObject(
+        sysroot_lib.Sysroot, 'portage_logdir', new=self.portage_dir)
     osutils.SafeMakedirs(self.portage_dir)
 
   def _InputProto(self, build_target=None, sysroot_path=None,
@@ -414,7 +416,9 @@
     osutils.SafeMakedirs(self.sysroot)
     # Set up portage log directory.
     self.target_sysroot = sysroot_lib.Sysroot(self.sysroot)
-    self.portage_dir = self.target_sysroot.portage_logdir
+    self.portage_dir = os.path.join(self.tempdir, 'portage_logdir')
+    self.PatchObject(
+        sysroot_lib.Sysroot, 'portage_logdir', new=self.portage_dir)
     osutils.SafeMakedirs(self.portage_dir)
     # Set up goma directories.
     self.goma_dir = os.path.join(self.tempdir, 'goma_dir')