Re: [U-Boot] [PATCH v4 4/6] test/py: Add base test case for A/B updates

Hi Igor,

On Tue, Jul 2, 2019 at 11:51 AM Igor Opaniuk igor.opaniuk@gmail.com wrote:

From: Ruslan Trofymenko ruslan.trofymenko@linaro.org

Add sandbox test for 'ab_select' command.

Test: ./test/py/test.py --bd sandbox --build -k test_ab

Signed-off-by: Ruslan Trofymenko ruslan.trofymenko@linaro.org Signed-off-by: Igor Opaniuk igor.opaniuk@gmail.com Reviewed-by: Alistair Strachan astrachan@google.com Reviewed-by: Sam Protsenko semen.protsenko@linaro.org Reviewed-by: Simon Glass sjg@chromium.org

---

Changes in v4: None Changes in v3: None

Changes in v2:

• Changes related to command renaming (android_ab_select->ab_select).
• Assertion condition was clarified. Full command output is controlled.

configs/sandbox_defconfig | 2 ++ test/py/tests/test_ab.py | 74 +++++++++++++++++++++++++++++++++++++++

1. Can we please move it to test/py/tests/test_android/test_ab.py? This way we can run all android related tests if we want to, and test namespace won't get cluttered. 2. It's better to use long options for sgdisk tool. I found out that AOSP sgdisk doesn't work with short options. This change [1] fixed the problem for me, and it works with both AOSP and system version of sgdisk now. Can you please incorporate it in next version?

2 files changed, 76 insertions(+) create mode 100644 test/py/tests/test_ab.py

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 6894262b89..fd51a75b01 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -20,6 +20,7 @@ CONFIG_PRE_CON_BUF_ADDR=0xf0000 CONFIG_LOG_MAX_LEVEL=6 CONFIG_LOG_ERROR_RETURN=y CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_ANDROID_AB=y CONFIG_CMD_CPU=y CONFIG_CMD_LICENSE=y CONFIG_CMD_BOOTZ=y @@ -47,6 +48,7 @@ CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_AXI=y +CONFIG_CMD_AB_SELECT=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y CONFIG_CMD_RARP=y diff --git a/test/py/tests/test_ab.py b/test/py/tests/test_ab.py new file mode 100644 index 0000000000..b90ca87a02 --- /dev/null +++ b/test/py/tests/test_ab.py @@ -0,0 +1,74 @@ +# SPDX-License-Identifier: GPL-2.0 +# (C) Copyright 2018 Texas Instruments, <www.ti.com>

+# Test A/B update commands.

+import os +import pytest +import u_boot_utils

+class ABTestDiskImage(object):

• """Disk Image used by the A/B tests."""
• def __init__(self, u_boot_console):

•    """Initialize a new ABTestDiskImage object.
  

•    Args:
  

•        u_boot_console: A U-Boot console.
  

•    Returns:
  

•        Nothing.
  

•    """
  

•    filename = 'test_ab_disk_image.bin'
  

•    persistent = u_boot_console.config.persistent_data_dir + '/' + filename
  

•    self.path = u_boot_console.config.result_dir  + '/' + filename
  

•    with u_boot_utils.persistent_file_helper(u_boot_console.log, persistent):
  

•        if os.path.exists(persistent):
  

•            u_boot_console.log.action('Disk image file ' + persistent +
  

•                ' already exists')
  

•        else:
  

•            u_boot_console.log.action('Generating ' + persistent)
  

•            fd = os.open(persistent, os.O_RDWR | os.O_CREAT)
  

•            os.ftruncate(fd, 524288)
  

•            os.close(fd)
  

•            cmd = ('sgdisk', persistent)
  

•            u_boot_utils.run_and_log(u_boot_console, cmd)
  

•            cmd = ('sgdisk', '--new=1:64:512', '-c 1:misc', persistent)
  

•            u_boot_utils.run_and_log(u_boot_console, cmd)
  

•            cmd = ('sgdisk', '-l', persistent)
  

•            u_boot_utils.run_and_log(u_boot_console, cmd)
  

•    cmd = ('cp', persistent, self.path)
  

•    u_boot_utils.run_and_log(u_boot_console, cmd)
  

+di = None +@pytest.fixture(scope='function') +def ab_disk_image(u_boot_console):

• global di
• if not di:

•    di = ABTestDiskImage(u_boot_console)
  

• return di

+@pytest.mark.boardspec('sandbox') +@pytest.mark.buildconfigspec('android_ab') +@pytest.mark.buildconfigspec('cmd_ab_select') +@pytest.mark.requiredtool('sgdisk') +def test_ab(ab_disk_image, u_boot_console):

• """Test the 'ab_select' command."""
• u_boot_console.run_command('host bind 0 ' + ab_disk_image.path)
• output = u_boot_console.run_command('ab_select slot_name host 0#misc')
• assert 're-initializing A/B metadata' in output
• assert 'Attempting slot a, tries remaining 7' in output
• output = u_boot_console.run_command('printenv slot_name')
• assert 'slot_name=a' in output
• output = u_boot_console.run_command('ab_select slot_name host 0:1')
• assert 'Attempting slot b, tries remaining 7' in output
• output = u_boot_console.run_command('printenv slot_name')
• assert 'slot_name=b' in output

-- 2.17.1