commit 92eb66ebaff0922fa6f7bbbbd70eb8f810ef12ae
author Sven Zheng <svenzheng@chromium.org> Thu Feb 03 21:23:51 2022 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Feb 04 00:50:35 2022 +0000
tree bc2ee1aa86a2c211bcf33a11ba5a73d635f1ded4
parent 959cb0f2bf6490b795f200a364f5820b476c1d42

Adds an option to reset Lacros

For bisect, every time we deploy Lacros, it need to be
reset to initial state. This is how other platform works.
Adding this flag for bisect tool to use.

Bug: 1289480
TEST: Tested locally.
Change-Id: I123ee0d8ffb16355bdf2fb49a9af99935287f779
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3437771
Reviewed-by: Erik Chen <erikchen@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Tested-by: Sven Zheng <svenzheng@chromium.org>
Commit-Queue: Sven Zheng <svenzheng@chromium.org>

scripts/deploy_chrome.py

diff --git a/scripts/deploy_chrome.py b/scripts/deploy_chrome.py
index b2434bd..7dffa2c 100644
--- a/scripts/deploy_chrome.py
+++ b/scripts/deploy_chrome.py
@@ -75,6 +75,7 @@
 LACROS_DIR = '/usr/local/lacros-chrome'
 _CONF_FILE = '/etc/chrome_dev.conf'
 _KILL_LACROS_CHROME_CMD = 'pkill -f %(lacros_dir)s/chrome'
+_RESET_LACROS_CHROME_CMD = 'rm -rf /home/chronos/user/lacros'
 MODIFIED_CONF_FILE = f'modified {_CONF_FILE}'
 
 # This command checks if "--enable-features=LacrosSupport" is present in
@@ -229,6 +230,10 @@
     self.device.run(_KILL_LACROS_CHROME_CMD %
                     {'lacros_dir': self.options.target_dir}, check=False)
 
+  def _ResetLacrosChrome(self):
+    """Reset Lacros to fresh state by deleting user data dir."""
+    self.device.run(_RESET_LACROS_CHROME_CMD, check=False)
+
   def _KillAshChromeIfNeeded(self):
     """This method kills ash-chrome on the device, if it's running.
 
@@ -477,6 +482,8 @@
       # If this is a lacros build, we only want to restart ash-chrome if needed.
       restart_ui = False
       steps.append(self._KillLacrosChrome)
+      if self.options.reset_lacros:
+        steps.append(self._ResetLacrosChrome)
       if self.options.modify_config_file:
         restart_ui = self._ModifyConfigFileIfNeededForLacros()
 
@@ -609,6 +616,9 @@
                            'binaries.' % _CHROME_TEST_BIN_DIR)
   parser.add_argument('--lacros', action='store_true', default=False,
                       help='Deploys lacros-chrome rather than ash-chrome.')
+  parser.add_argument('--reset-lacros', action='store_true', default=False,
+                      help='Reset Lacros by deleting Lacros user data dir if '
+                           'exists.')
   parser.add_argument('--skip-modifying-config-file', action='store_false',
                       dest='modify_config_file',
                       help='By default, deploying lacros-chrome modifies the '