| Message ID | 1543348642-31045-6-git-send-email-ruslan.trofymenko@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | android: Implement A/B boot process | expand |
On Tue, 27 Nov 2018 at 12:57, Ruslan Trofymenko <ruslan.trofymenko@linaro.org> wrote: > > Add sandbox test for 'android_ab_select' command. > > Test: ./test/py/test.py --bd sandbox --build -k test_ab > > Signed-off-by: Ruslan Trofymenko <ruslan.trofymenko@linaro.org> > --- > configs/sandbox_defconfig | 2 ++ > test/py/tests/test_ab.py | 74 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 76 insertions(+) > create mode 100644 test/py/tests/test_ab.py Reviewed-by: Simon Glass <sjg@chromium.org> Please see below > > diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig > index 5a744f4..f246f89 100644 > --- a/configs/sandbox_defconfig > +++ b/configs/sandbox_defconfig > @@ -20,6 +20,7 @@ CONFIG_PRE_CON_BUF_ADDR=0x100000 > 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 > @@ -61,6 +62,7 @@ CONFIG_CMD_TIME=y > CONFIG_CMD_TIMER=y > CONFIG_CMD_SOUND=y > CONFIG_CMD_QFW=y > +CONFIG_CMD_ANDROID_AB_SELECT=y > CONFIG_CMD_BOOTSTAGE=y > CONFIG_CMD_PMIC=y > CONFIG_CMD_REGULATOR=y > diff --git a/test/py/tests/test_ab.py b/test/py/tests/test_ab.py > new file mode 100644 > index 0000000..f27538e > --- /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_android_ab_select') > +@pytest.mark.requiredtool('sgdisk') > +def test_ab(ab_disk_image, u_boot_console): > + """Test the 'android_ab_select' command.""" > + > + u_boot_console.run_command('host bind 0 ' + ab_disk_image.path) > + > + output = u_boot_console.run_command('android_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 'a' in output I just worry their mind be other next there. Maybe assert 'b' not in output ? > + > + output = u_boot_console.run_command('android_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 'b' in output > -- > 2.7.4 > Regards, Simon
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 5a744f4..f246f89 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -20,6 +20,7 @@ CONFIG_PRE_CON_BUF_ADDR=0x100000 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 @@ -61,6 +62,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_CMD_SOUND=y CONFIG_CMD_QFW=y +CONFIG_CMD_ANDROID_AB_SELECT=y CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y diff --git a/test/py/tests/test_ab.py b/test/py/tests/test_ab.py new file mode 100644 index 0000000..f27538e --- /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_android_ab_select') +@pytest.mark.requiredtool('sgdisk') +def test_ab(ab_disk_image, u_boot_console): + """Test the 'android_ab_select' command.""" + + u_boot_console.run_command('host bind 0 ' + ab_disk_image.path) + + output = u_boot_console.run_command('android_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 'a' in output + + output = u_boot_console.run_command('android_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 'b' in output
Add sandbox test for 'android_ab_select' command. Test: ./test/py/test.py --bd sandbox --build -k test_ab Signed-off-by: Ruslan Trofymenko <ruslan.trofymenko@linaro.org> --- configs/sandbox_defconfig | 2 ++ test/py/tests/test_ab.py | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 test/py/tests/test_ab.py