commit 1f67cf3bf610fc9b1d33d693c326e1071a7a2496
author Alex Klein <saklein@chromium.org> Wed Oct 09 11:13:42 2019 -0600
committer George Engelbrecht <engeg@google.com> Thu Oct 10 16:07:37 2019 +0000
tree 425f7b3eb4a035dfeb2a897e0de1c286d589357c
parent 8e881f105660fce901e238c4926008c24874eb16

goma_util: Fix tempdir creation for luci builders.

Pass through path to the chroot dir so the Luci builders don't
have to rely on the chroot dir living at the default location.

BUG=chromium:1012787
TEST=builders pass

Change-Id: I506521f7be961e1836ee05716290ae2d3bc0068a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1849455
Tested-by: David Burger <dburger@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>

api/controller/controller_util_unittest.py

diff --git a/api/controller/controller_util_unittest.py b/api/controller/controller_util_unittest.py
index ea96fc3..df6b441 100644
--- a/api/controller/controller_util_unittest.py
+++ b/api/controller/controller_util_unittest.py
@@ -7,6 +7,8 @@
 
 from __future__ import print_function
 
+import os
+
 from chromite.api.controller import controller_util
 from chromite.api.gen.chromite.api import build_api_test_pb2
 from chromite.api.gen.chromiumos import common_pb2
@@ -46,6 +48,7 @@
   def testChrootCallToGoma(self):
     """Test calls to goma."""
     path = '/chroot/path'
+    chroot_tmp = os.path.join(path, 'tmp')
     cache_dir = '/cache/dir'
     chrome_root = '/chrome/root'
     use_flags = [{'flag': 'useflag1'}, {'flag': 'useflag2'}]
@@ -54,6 +57,7 @@
     goma_test_json_string = 'goma_json'
     chromeos_goma_test_dir = '/chromeos/goma/test/dir'
 
+    # Patch goma constructor to avoid creating misc dirs.
     patch = self.PatchObject(goma_util, 'Goma')
 
     goma_config = common_pb2.GomaConfig(goma_dir=goma_test_dir,
@@ -66,7 +70,8 @@
 
     controller_util.ParseChroot(chroot_message)
     patch.assert_called_with(goma_test_dir, goma_test_json_string,
-                             stage_name='BuildAPI', chromeos_goma_dir=None)
+                             stage_name='BuildAPI', chromeos_goma_dir=None,
+                             chroot_tmp=chroot_tmp)
 
     goma_config.chromeos_goma_dir = chromeos_goma_test_dir
     chroot_message = common_pb2.Chroot(path=path, cache_dir=cache_dir,
@@ -78,7 +83,8 @@
     controller_util.ParseChroot(chroot_message)
     patch.assert_called_with(goma_test_dir, goma_test_json_string,
                              stage_name='BuildAPI',
-                             chromeos_goma_dir=chromeos_goma_test_dir)
+                             chromeos_goma_dir=chromeos_goma_test_dir,
+                             chroot_tmp=chroot_tmp)
 
 
   def testWrongMessage(self):