commit 4d784ad1992f5b9937a032b04d09bd9d2fd8cad7
author Alex Klein <saklein@chromium.org> Tue Oct 01 11:59:40 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Wed Oct 02 02:43:23 2019 +0000
tree fd5b63d70c8caa6ef48f28e6b930cd12e99a921b
parent c0d64b05d9393f7c9fd1e30c7472dbdaa06f457e

services: chroot tempdir cleanup

Switch some trailing manual chroot tmp dir tempdir creations
to use the Chroot.tempdir method instead.

BUG=None
TEST=run_tests

Change-Id: Id63d4f93e0d2dc6002f1c074815a95f8da552236
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1834108
Tested-by: Alex Klein <saklein@chromium.org>
Auto-Submit: Alex Klein <saklein@chromium.org>
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Michael Mortensen <mmortensen@google.com>

service/artifacts.py

diff --git a/service/artifacts.py b/service/artifacts.py
index d510df8..0a53717 100644
--- a/service/artifacts.py
+++ b/service/artifacts.py
@@ -354,8 +354,7 @@
   chroot_args = chroot.get_enter_args()
 
   extra_env = {'USE': 'chrome_internal'}
-  base_dir = os.path.join(chroot.path, 'tmp')
-  with osutils.TempDir(base_dir=base_dir) as tempdir:
+  with chroot.tempdir() as tempdir:
     in_chroot_path = os.path.relpath(tempdir, chroot.path)
     cmd = ['cros_generate_sysroot', '--out-dir', in_chroot_path, '--board',
            build_target.name, '--deps-only', '--package', constants.CHROME_CP]

service/test.py

diff --git a/service/test.py b/service/test.py
index 8f10c2e..6cb831a 100644
--- a/service/test.py
+++ b/service/test.py
@@ -68,8 +68,7 @@
 
   # Set up the failed package status file.
   extra_env = chroot.env
-  base_dir = os.path.join(chroot.path, 'tmp')
-  with osutils.TempDir(base_dir=base_dir) as tempdir:
+  with chroot.tempdir() as tempdir:
     extra_env[constants.CROS_METRICS_DIR_ENVVAR] = tempdir
 
     result = cros_build_lib.run(cmd, enter_chroot=True,