commit 655e80456a03acae8fbc86e8c8a53dab7606d52c
author Evan Hernandez <evanhernandez@chromium.org> Thu Jun 13 12:50:44 2019 -0600
committer Evan Hernandez <evanhernandez@chromium.org> Tue Jun 18 19:17:56 2019 +0000
tree 03670af1c76f9a85595d051a0c075fe89e56a6cc
parent 7b8008e2e7e427eed20b92e4711478c0d64749bf

test: MoblabVmTest assumes it is outside chroot

TEST=./run_tests
BUG=chromium:954276

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

api/controller/test_unittest.py

diff --git a/api/controller/test_unittest.py b/api/controller/test_unittest.py
index 616b487..260d9da 100644
--- a/api/controller/test_unittest.py
+++ b/api/controller/test_unittest.py
@@ -11,6 +11,7 @@
 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
@@ -199,6 +200,7 @@
 
   def _Input(self):
     return test_pb2.MoblabVmTestRequest(
+        chroot=common_pb2.Chroot(path='path/to/chroot'),
         image_payload=self._Payload(self.image_payload_dir),
         cache_payloads=[self._Payload(self.autotest_payload_dir)])
 
@@ -209,6 +211,8 @@
     self.image_cache_dir = '/mnt/moblab/cache'
     self.image_mount_dir = '/mnt/image'
 
+    self.PatchObject(controller_util, 'ParseChroot')
+
     self.mock_create_moblab_vms = self.PatchObject(
         test_service, 'CreateMoblabVm')
     self.mock_prepare_moblab_vm_image_cache = self.PatchObject(
@@ -245,7 +249,8 @@
         [mock.call(mock.ANY, self.builder, [self.autotest_payload_dir])])
     self.assertEqual(
         self.mock_run_moblab_vm_tests.call_args_list,
-        [mock.call(mock.ANY, self.builder, self.image_cache_dir, mock.ANY)])
+        [mock.call(mock.ANY, mock.ANY, self.builder, self.image_cache_dir,
+                   mock.ANY)])
     self.assertEqual(
         self.mock_validate_moblab_vm_tests.call_args_list,
         [mock.call(mock.ANY)])