[PATCH 09/11] test: Reformat line wraps in img setup functions

[Simon Glass]

Some call-sites use awkward line wraps inherited from test_ut.py

Adjust the wrapping so each call uses a more natural format with the
first argument on the same line as the function name where possible,
and arguments wrapped on natural boundaries elsewhere. No behaviour
changes.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 test/py/img/android.py | 15 ++++++++-------
 test/py/img/cedit.py   |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/py/img/android.py b/test/py/img/android.py
index 77c5d33c8f0..ae59f95c8e5 100644
--- a/test/py/img/android.py
+++ b/test/py/img/android.py
@@ -59,8 +59,7 @@ def setup_android_image(ubman):
             size = int(size_str[:-1]) * sect_1mb
         else:
             size = int(size_str)
-        utils.run_and_log(
-            ubman,
+        utils.run_and_log(ubman,
             f"cgpt add -i {part['num']} -b {ptr} -s {size} -l {part['label']} -t basicdata {fname}")
         ptr += size
 
@@ -75,12 +74,14 @@ def setup_android_image(ubman):
     with open(fname, 'rb') as inf:
         disk_data = inf.read()
 
-    test_abootimg.AbootimgTestDiskImage(ubman, 'bootv4.img', test_abootimg.boot_img_hex)
+    test_abootimg.AbootimgTestDiskImage(ubman, 'bootv4.img',
+                                        test_abootimg.boot_img_hex)
     boot_img = os.path.join(ubman.config.result_dir, 'bootv4.img')
     with open(boot_img, 'rb') as inf:
         set_part_data(2, inf.read())
 
-    test_abootimg.AbootimgTestDiskImage(ubman, 'vendor_boot.img', test_abootimg.vboot_img_hex)
+    test_abootimg.AbootimgTestDiskImage(ubman, 'vendor_boot.img',
+                                        test_abootimg.vboot_img_hex)
     vendor_boot_img = os.path.join(ubman.config.result_dir, 'vendor_boot.img')
     with open(vendor_boot_img, 'rb') as inf:
         set_part_data(4, inf.read())
@@ -113,8 +114,7 @@ def setup_android_image(ubman):
             size = int(size_str[:-1]) * sect_1mb
         else:
             size = int(size_str)
-        utils.run_and_log(
-            ubman,
+        utils.run_and_log(ubman,
             f"cgpt add -i {part['num']} -b {ptr} -s {size} -l {part['label']} -t basicdata {fname}")
         ptr += size
 
@@ -129,7 +129,8 @@ def setup_android_image(ubman):
     with open(fname, 'rb') as inf:
         disk_data = inf.read()
 
-    test_abootimg.AbootimgTestDiskImage(ubman, 'boot.img', test_abootimg.img_hex)
+    test_abootimg.AbootimgTestDiskImage(ubman, 'boot.img',
+                                        test_abootimg.img_hex)
     boot_img = os.path.join(ubman.config.result_dir, 'boot.img')
     with open(boot_img, 'rb') as inf:
         set_part_data(2, inf.read())
diff --git a/test/py/img/cedit.py b/test/py/img/cedit.py
index 1a995bc9768..989e33d4b6f 100644
--- a/test/py/img/cedit.py
+++ b/test/py/img/cedit.py
@@ -20,5 +20,5 @@ def setup_cedit_file(ubman):
                            'test/boot/files/expo_ids.h')
     expo_tool = os.path.join(ubman.config.source_dir, 'tools/expo.py')
     outfname = 'cedit.dtb'
-    utils.run_and_log(
-        ubman, f'{expo_tool} -e {inhname} -l {infname} -o {outfname}')
+    utils.run_and_log(ubman,
+                      f'{expo_tool} -e {inhname} -l {infname} -o {outfname}')
-- 
2.43.0