commit e21a095bc454dd6862ec05bd67d715824ffb6530
author Alex Klein <saklein@chromium.org> Fri Aug 23 16:08:16 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Mon Aug 26 16:26:13 2019 +0000
tree 5bac88fd84ae119980d39d141c52f3554a07be40
parent 7064c6b3b409dfbf183ff200670797721f091c18

BundleAutotestFiles: Refactor to chroot and sysroot arguments.

The BundleAutotestFiles is one of the few special cases for sysroot
path handling, and there is potential need for access to files
outside the sysroot.

BUG=None
TEST=run_tests

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

api/controller/artifacts_unittest.py

diff --git a/api/controller/artifacts_unittest.py b/api/controller/artifacts_unittest.py
index eb5e2d9..ab8f558 100644
--- a/api/controller/artifacts_unittest.py
+++ b/api/controller/artifacts_unittest.py
@@ -76,28 +76,21 @@
     self.output_dir = os.path.join(self.tempdir, 'artifacts')
     osutils.SafeMakedirs(self.output_dir)
 
-    # Old style paths.
-    self.old_sysroot_path = os.path.join(self.tempdir, 'cros', 'chroot',
-                                         'build', 'target')
-    self.old_sysroot = sysroot_lib.Sysroot(self.old_sysroot_path)
-    osutils.SafeMakedirs(self.old_sysroot_path)
-
     # Old style proto.
     self.input_proto = artifacts_pb2.BundleRequest()
     self.input_proto.build_target.name = 'target'
     self.input_proto.output_dir = self.output_dir
     self.output_proto = artifacts_pb2.BundleResponse()
 
-    source_root = os.path.join(self.tempdir, 'cros')
-    self.PatchObject(constants, 'SOURCE_ROOT', new=source_root)
+    self.chroot_path = os.path.join(self.tempdir, 'chroot')
+    self.PatchObject(constants, 'DEFAULT_CHROOT_PATH', new=self.chroot_path)
 
     # New style paths.
-    self.chroot_path = os.path.join(self.tempdir, 'cros', 'chroot')
     self.sysroot_path = '/build/target'
-    self.full_sysroot_path = os.path.join(self.chroot_path,
-                                          self.sysroot_path.lstrip(os.sep))
-    self.sysroot = sysroot_lib.Sysroot(self.full_sysroot_path)
-    osutils.SafeMakedirs(self.full_sysroot_path)
+    self.sysroot = sysroot_lib.Sysroot(self.sysroot_path)
+    full_sysroot_path = os.path.join(self.chroot_path,
+                                     self.sysroot_path.lstrip(os.sep))
+    osutils.SafeMakedirs(full_sysroot_path)
 
     # New style proto.
     self.request = artifacts_pb2.BundleRequest()
@@ -161,15 +154,15 @@
                              return_value=files)
 
     sysroot_patch = self.PatchObject(sysroot_lib, 'Sysroot',
-                                     return_value=self.old_sysroot)
+                                     return_value=self.sysroot)
     artifacts.BundleAutotestFiles(self.input_proto, self.output_proto,
                                   self.api_config)
 
     # Verify the sysroot is being built out correctly.
-    sysroot_patch.assert_called_with(self.old_sysroot_path)
+    sysroot_patch.assert_called_with(self.sysroot_path)
 
     # Verify the arguments are being passed through.
-    patch.assert_called_with(self.old_sysroot, self.output_dir)
+    patch.assert_called_with(mock.ANY, self.sysroot, self.output_dir)
 
     # Verify the output proto is being populated correctly.
     self.assertTrue(self.output_proto.artifacts)
@@ -190,10 +183,10 @@
     artifacts.BundleAutotestFiles(self.request, self.response, self.api_config)
 
     # Verify the sysroot is being built out correctly.
-    sysroot_patch.assert_called_with(self.full_sysroot_path)
+    sysroot_patch.assert_called_with(self.sysroot_path)
 
     # Verify the arguments are being passed through.
-    patch.assert_called_with(self.sysroot, self.output_dir)
+    patch.assert_called_with(mock.ANY, self.sysroot, self.output_dir)
 
     # Verify the output proto is being populated correctly.
     self.assertTrue(self.response.artifacts)