commit 24fc60c46d1176eb5d5baf2f8b6f5d7afe2b478e
author Yuke Liao <liaoyuke@chromium.org> Sat Dec 26 22:16:49 2020 -0800
committer Commit Bot <commit-bot@chromium.org> Wed Jan 06 10:37:58 2021 +0000
tree 78125a57bfec28e5fe7c2748dcd7e331df82b281
parent c9f836f9479bf843cfd82c9a77e4ab28a0e042de

Lacros: Support --deploy-lacros in cros_run_test

The main use case is to support running lacros tast tests on Chromium
CI, which builds lacros-chrome from tot invokes cros_run_test script to
run tests on DUTs.

BUG=chromium:1158590
TEST=unit tests.

Change-Id: Icf3797540792ce6a19572d166f2412179a69400d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2605228
Tested-by: Yuke Liao <liaoyuke@chromium.org>
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>

scripts/deploy_chrome_unittest.py

diff --git a/scripts/deploy_chrome_unittest.py b/scripts/deploy_chrome_unittest.py
index 273a9cc..4f283d9 100644
--- a/scripts/deploy_chrome_unittest.py
+++ b/scripts/deploy_chrome_unittest.py
@@ -477,9 +477,23 @@
   """Line coverage for Perform() method with --lacros option."""
 
   def setUp(self):
-    options = _ParseCommandLine([
-        '--lacros', '--nostrip', '--build-dir', '/path/to/nowhere',
-        '--device', 'monkey'])
+    self.deploy = None
+    self._ran_start_command = False
+    self.StartPatcher(parallel_unittest.ParallelMock())
+
+    def start_ui_side_effect(*args, **kwargs):
+      # pylint: disable=unused-argument
+      self._ran_start_command = True
+
+    self.rc.AddCmdResult(partial_mock.In('start ui'),
+                         side_effect=start_ui_side_effect)
+
+  def prepareDeploy(self, options=None):
+    if not options:
+      options = _ParseCommandLine([
+          '--lacros', '--nostrip', '--build-dir', '/path/to/nowhere',
+          '--device', 'monkey'
+      ])
     self.deploy = deploy_chrome.DeployChrome(
         options, self.tempdir, os.path.join(self.tempdir, 'staging'))
 
@@ -492,24 +506,17 @@
     self.deploy._PrepareStagingDir = mock.Mock()
     self.deploy._CheckDeviceFreeSpace = mock.Mock()
     self.deploy._KillAshChromeIfNeeded = mock.Mock()
-    self.StartPatcher(parallel_unittest.ParallelMock())
-
-    self._ran_start_command = False
-
-    def start_ui_side_effect(*args, **kwargs):
-      # pylint: disable=unused-argument
-      self._ran_start_command = True
-    self.rc.AddCmdResult(partial_mock.In('start ui'),
-                         side_effect=start_ui_side_effect)
 
   def testConfNotModified(self):
     """When the conf file is not modified we don't restart chrome ."""
+    self.prepareDeploy()
     self.deploy.Perform()
     self.deploy._KillAshChromeIfNeeded.assert_not_called()
     self.assertFalse(self._ran_start_command)
 
   def testConfModified(self):
     """When the conf file is modified we restart chrome."""
+    self.prepareDeploy()
 
     # We intentionally add '\n' to MODIFIED_CONF_FILE to simulate echo adding a
     # newline when invoked in the shell.
@@ -520,3 +527,19 @@
     self.deploy.Perform()
     self.deploy._KillAshChromeIfNeeded.assert_called()
     self.assertTrue(self._ran_start_command)
+
+  def testSkipModifyingConf(self):
+    """SKip modifying the config file when the argument is specified."""
+    self.prepareDeploy(
+        _ParseCommandLine([
+            '--lacros', '--nostrip', '--build-dir', '/path/to/nowhere',
+            '--device', 'monkey', '--skip-modifying-config-file'
+        ]))
+
+    self.rc.AddCmdResult(
+        partial_mock.In(deploy_chrome.ENABLE_LACROS_VIA_CONF_COMMAND),
+        stdout=deploy_chrome.MODIFIED_CONF_FILE + '\n')
+
+    self.deploy.Perform()
+    self.deploy._KillAshChromeIfNeeded.assert_not_called()
+    self.assertFalse(self._ran_start_command)