commit f845b816079e72207f8d8c6bab56896fb8e7a3ec
author Amin Hassani <ahassani@chromium.org> Tue Mar 17 14:57:00 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Mar 18 21:39:08 2020 +0000
tree 7a465cdb6dc580bfd40895d7460357f8df657492
parent f3fc8b60bec721e9f66012b21606d0c2f9a1e09a

cros_generate_update_payload: Some cleanup

- Removed unneeded flags for extracting kernel and rootfs.
- Change underscore to dash in flag names.
- Remove out_metadat_hash_file. Its not usd anywhere.

BUG=chromium:1054533
TEST=cros_generate_update_payload --tgt-image chromiumos_test_image.bin --output /tmp/delta.bin

Change-Id: I043fe87110dc12815bac9ef7a9882d56902026a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2107887
Commit-Queue: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Andrew Lassalle <andrewlassalle@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_generate_update_payload_unittest.py

diff --git a/scripts/cros_generate_update_payload_unittest.py b/scripts/cros_generate_update_payload_unittest.py
index 3997daa..10f951f 100644
--- a/scripts/cros_generate_update_payload_unittest.py
+++ b/scripts/cros_generate_update_payload_unittest.py
@@ -11,8 +11,6 @@
 
 from chromite.lib import cros_test_lib
 from chromite.lib import partial_mock
-
-from chromite.lib.paygen import partition_lib
 from chromite.lib.paygen import paygen_payload_lib
 
 from chromite.scripts import cros_generate_update_payload
@@ -32,42 +30,18 @@
     paygen_mock = self.PatchObject(paygen_payload_lib, 'GenerateUpdatePayload')
 
     cros_generate_update_payload.main([
-        '--image', 'foo-image',
-        '--src_image', 'foo-src-image',
+        '--tgt-image', 'foo-tgt-image',
+        '--src-image', 'foo-src-image',
         '--output', 'foo-output',
         '--check',
-        '--private_key', 'foo-private-key',
-        '--out_metadata_hash_file', 'foo-metadata-hash',
-        '--work_dir', 'foo-work-dir',
+        '--private-key', 'foo-private-key',
+        '--work-dir', 'foo-work-dir',
     ])
 
     paygen_mock.assert_called_once_with(
-        partial_mock.HasString('foo-image'),
+        partial_mock.HasString('foo-tgt-image'),
         partial_mock.HasString('foo-output'),
         src_image=partial_mock.HasString('foo-src-image'),
         work_dir=partial_mock.HasString('foo-work-dir'),
         private_key=partial_mock.HasString('foo-private-key'),
-        check=True,
-        out_metadata_hash_file=partial_mock.HasString('foo-metadata-hash'))
-
-  def testExtractPartitions(self):
-    """Test extracting partitions."""
-
-    kernel_mock = self.PatchObject(partition_lib, 'ExtractKernel')
-    root_mock = self.PatchObject(partition_lib, 'ExtractRoot')
-
-    cros_generate_update_payload.main([
-        '--image', 'foo-image',
-        '--extract',
-        '--kern_path', 'foo-kernel',
-        '--root_path', 'foo-root',
-        '--root_pretruncate_path', 'foo-pretruncate',
-    ])
-
-    kernel_mock.assert_called_once_with(partial_mock.HasString('foo-image'),
-                                        partial_mock.HasString('foo-kernel'))
-    root_mock.assert_calls_with(partial_mock.HasString('foo-image'),
-                                partial_mock.HasString('foo-root'))
-    root_mock.assert_calls_with(partial_mock.HasString('foo-image'),
-                                partial_mock.HasString('foo-pretruncate'),
-                                truncate=False)
+        check=True)