commit e1e05d3d5d4dc5ee115a013668fd82e68c9acf7c
author Evan Hernandez <evanhernandez@chromium.org> Fri Jul 19 12:32:18 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Mon Jul 22 19:16:30 2019 +0000
tree 21d6f3b7e26873b062107cdc06b5d6fa4d14d412
parent ca4d19a8be2a578d568d05dbab9b9dd1bb63569c

test: Pass chroot path to moblab_vm.

TEST=./run_tests
BUG=chromium:954276

Change-Id: Id16b5371c01f9a325ef3c4eaf92a412a8229fcd3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1710765
Tested-by: Evan Hernandez <evanhernandez@chromium.org>
Auto-Submit: Evan Hernandez <evanhernandez@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>
Commit-Queue: Evan Hernandez <evanhernandez@chromium.org>

api/controller/test.py

diff --git a/api/controller/test.py b/api/controller/test.py
index 70a3931..f9fa8ee 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -163,7 +163,7 @@
 
   # Now we can run the tests.
   with chroot.tempdir() as workspace_dir, chroot.tempdir() as results_dir:
-    vms = test.CreateMoblabVm(workspace_dir, image_payload_dir)
+    vms = test.CreateMoblabVm(workspace_dir, chroot.path, image_payload_dir)
     cache_dir = test.PrepareMoblabVmImageCache(vms, builder, cache_payload_dirs)
     test.RunMoblabVmTest(chroot, vms, builder, cache_dir, results_dir)
     test.ValidateMoblabVmTest(results_dir)

api/controller/test_unittest.py

diff --git a/api/controller/test_unittest.py b/api/controller/test_unittest.py
index d1b6302..f73e1c2 100644
--- a/api/controller/test_unittest.py
+++ b/api/controller/test_unittest.py
@@ -11,10 +11,10 @@
 import mock
 
 from chromite.api import controller
-from chromite.api.controller import controller_util
 from chromite.api.controller import test as test_controller
 from chromite.api.gen.chromiumos import common_pb2
 from chromite.api.gen.chromite.api import test_pb2
+from chromite.lib import chroot_lib
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_test_lib
 from chromite.lib import image_lib
@@ -200,18 +200,20 @@
 
   def _Input(self):
     return test_pb2.MoblabVmTestRequest(
-        chroot=common_pb2.Chroot(path='path/to/chroot'),
+        chroot=common_pb2.Chroot(path=self.chroot_dir),
         image_payload=self._Payload(self.image_payload_dir),
         cache_payloads=[self._Payload(self.autotest_payload_dir)])
 
   def setUp(self):
+    self.chroot_dir = '/chroot'
+    self.chroot_tmp_dir = '/chroot/tmp'
     self.image_payload_dir = '/payloads/image'
     self.autotest_payload_dir = '/payloads/autotest'
     self.builder = 'moblab-generic-vm/R12-3.4.5-67.890'
     self.image_cache_dir = '/mnt/moblab/cache'
     self.image_mount_dir = '/mnt/image'
 
-    self.PatchObject(controller_util, 'ParseChroot')
+    self.PatchObject(chroot_lib.Chroot, 'tempdir', osutils.TempDir)
 
     self.mock_create_moblab_vms = self.PatchObject(
         test_service, 'CreateMoblabVm')
@@ -243,7 +245,7 @@
 
     self.assertEqual(
         self.mock_create_moblab_vms.call_args_list,
-        [mock.call(mock.ANY, self.image_payload_dir)])
+        [mock.call(mock.ANY, self.chroot_dir, self.image_payload_dir)])
     self.assertEqual(
         self.mock_prepare_moblab_vm_image_cache.call_args_list,
         [mock.call(mock.ANY, self.builder, [self.autotest_payload_dir])])