commit 488a122c31a117f019a914693572bcd3f3b9b296
author Amin Hassani <ahassani@chromium.org> Thu Jun 11 14:40:43 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Mon Jun 15 23:49:12 2020 +0000
tree 8a9139bcfe8c4a96d009faf297e15b889a227b0f
parent 5341862eef0ae0b80267105c22eae3d0409694ee

auto_updater: Remove unused arg device_restore_dir

BUG=chromium:1008058
TEST=run_pytest

Change-Id: Id0ec128700b06fcdb00b00646870fb17be940191
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2242099
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Sanika Kulkarni <sanikak@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>

lib/auto_updater.py

diff --git a/lib/auto_updater.py b/lib/auto_updater.py
index 482e9a9..5f4dfee 100644
--- a/lib/auto_updater.py
+++ b/lib/auto_updater.py
@@ -215,7 +215,6 @@
     self.device_dev_dir = os.path.join(self.device.work_dir, 'src')
     self.device_payload_dir = os.path.join(self.device.work_dir,
                                            self.PAYLOAD_DIR_NAME)
-    self.device_restore_dir = os.path.join(self.device.work_dir, 'old')
     # autoupdate_EndToEndTest uses exact payload filename for update
     self.payload_filename = payload_filename
     if send_payload_in_parallel:
@@ -271,7 +270,6 @@
         cmd_kwargs=self._cmd_kwargs,
         transfer_rootfs_update=self._do_rootfs_update,
         transfer_stateful_update=self._do_rootfs_update, dev_dir=self.dev_dir,
-        device_restore_dir=self.device_restore_dir,
         device_payload_dir=self.device_payload_dir, tempdir=self.tempdir,
         payload_mode=self.payload_mode, **cls_kwargs)
 

lib/auto_updater_transfer.py

diff --git a/lib/auto_updater_transfer.py b/lib/auto_updater_transfer.py
index 8dcc0d8..9f75750 100644
--- a/lib/auto_updater_transfer.py
+++ b/lib/auto_updater_transfer.py
@@ -96,7 +96,7 @@
 
   PAYLOAD_DIR_NAME = 'payloads'
 
-  def __init__(self, device, payload_dir, device_restore_dir, tempdir,
+  def __init__(self, device, payload_dir, tempdir,
                payload_name, cmd_kwargs, device_payload_dir, dev_dir='',
                payload_mode='scp', transfer_stateful_update=True,
                transfer_rootfs_update=True):
@@ -105,8 +105,6 @@
     Args:
       device: The ChromiumOSDevice to be updated.
       payload_dir: The directory of payload(s).
-      device_restore_dir: Path to the old payload directory in the device's work
-          directory.
       tempdir: The temp directory in caller, not in the device. For example,
           the tempdir for cros flash is /tmp/cros-flash****/, used to
           temporarily keep files when transferring update-utils package, and
@@ -125,7 +123,6 @@
     """
     self._device = device
     self._payload_dir = payload_dir
-    self._device_restore_dir = device_restore_dir
     self._tempdir = tempdir
     self._payload_name = payload_name
     self._cmd_kwargs = cmd_kwargs

lib/auto_updater_transfer_unittest.py

diff --git a/lib/auto_updater_transfer_unittest.py b/lib/auto_updater_transfer_unittest.py
index 3b5d336..aeb027e 100644
--- a/lib/auto_updater_transfer_unittest.py
+++ b/lib/auto_updater_transfer_unittest.py
@@ -31,7 +31,7 @@
 
 _DEFAULT_ARGS = {
     'payload_dir': None, 'device_payload_dir': None, 'tempdir': None,
-    'payload_name': None, 'cmd_kwargs': None, 'device_restore_dir': None,
+    'payload_name': None, 'cmd_kwargs': None,
 }