To split out the logic even further, do each image creation in a separate function.
This will make it cleaner to add future images as well. Signed-off-by: Mattijs Korpershoek <[email protected]> --- test/py/tests/test_android/android_image.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test/py/tests/test_android/android_image.py b/test/py/tests/test_android/android_image.py index b5fede8ebf0b..abdc6cd28744 100644 --- a/test/py/tests/test_android/android_image.py +++ b/test/py/tests/test_android/android_image.py @@ -56,8 +56,8 @@ def create_gpt_image(ubman, mmc_dev, required_parts, images): with open(fname, 'wb') as outf: outf.write(disk_data) -def setup_android_image(ubman): - mmc_dev = 7 +def setup_android_v4_image(ubman): + """Create mmc7.img: boot image v4 with vendor_boot partitions.""" required_parts = [ {'num': 1, 'label':'misc', 'size': '1M'}, {'num': 2, 'label':'boot_a', 'size': '4M'}, @@ -69,9 +69,10 @@ def setup_android_image(ubman): (2, 'bootv4.img', test_abootimg.boot_img_hex), (4, 'vendor_boot.img', test_abootimg.vboot_img_hex), ] - create_gpt_image(ubman, mmc_dev, required_parts, images) + create_gpt_image(ubman, 7, required_parts, images) - mmc_dev = 8 +def setup_android_v2_image(ubman): + """Create mmc8.img: boot image v2 without vendor_boot.""" required_parts = [ {'num': 1, 'label':'misc', 'size': '1M'}, {'num': 2, 'label':'boot_a', 'size': '4M'}, @@ -80,4 +81,9 @@ def setup_android_image(ubman): images = [ (2, 'boot.img', test_abootimg.img_hex), ] - create_gpt_image(ubman, mmc_dev, required_parts, images) + create_gpt_image(ubman, 8, required_parts, images) + +def setup_android_image(ubman): + """Create disk images with Android partitions.""" + setup_android_v4_image(ubman) + setup_android_v2_image(ubman) -- 2.56.0
