Hi Mattijs On Thu, Oct 15, 2026 at 3:55 PM Mattijs Korpershoek <[email protected]> wrote: > > The tests format mmc_dev using str() conversion, which produces a > decimal string. This works when mmc_dev is 1, since "1" is valid in > both decimal and hex, but breaks for other device numbers like 12 > (0xc): str(12) produces "12", which avb init would interpret as 0x12. > > Use %x for commands that parse hex (avb init) and %d for commands that > parse decimal (mmc dev) to format device numbers correctly regardless > of their value. > > Signed-off-by: Mattijs Korpershoek <[email protected]> > --- > test/py/tests/test_android/test_avb.py | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > > diff --git a/test/py/tests/test_android/test_avb.py > b/test/py/tests/test_android/test_avb.py > index 137d83e1deab..c66ef0cc52d5 100644 > --- a/test/py/tests/test_android/test_avb.py > +++ b/test/py/tests/test_android/test_avb.py > @@ -29,7 +29,7 @@ def test_avb_verify(ubman): > > success_str = "Verification passed successfully" > > - response = ubman.run_command('avb init %s' %str(mmc_dev)) > + response = ubman.run_command('avb init %x' % mmc_dev) > assert response == '' > response = ubman.run_command('avb verify') > assert response.find(success_str) > @@ -43,11 +43,10 @@ def test_avb_mmc_uuid(ubman): > 'part list mmc 1' output > """ > > - response = ubman.run_command('avb init %s' % str(mmc_dev)) > + response = ubman.run_command('avb init %x' % mmc_dev) > assert response == '' > > - response = ubman.run_command('mmc rescan; mmc dev %s' % > - str(mmc_dev)) > + response = ubman.run_command('mmc rescan; mmc dev %d' % mmc_dev) > assert response.find('is current device') > > part_lines = ubman.run_command('mmc part').splitlines() > @@ -75,7 +74,7 @@ def test_avb_read_rb(ubman): > """Test reading rollback indexes > """ > > - response = ubman.run_command('avb init %s' % str(mmc_dev)) > + response = ubman.run_command('avb init %x' % mmc_dev) > assert response == '' > > response = ubman.run_command('avb read_rb 1') > @@ -87,7 +86,7 @@ def test_avb_is_unlocked(ubman): > """Test if device is in the unlocked state > """ > > - response = ubman.run_command('avb init %s' % str(mmc_dev)) > + response = ubman.run_command('avb init %x' % mmc_dev) > assert response == '' > > response = ubman.run_command('avb is_unlocked') > @@ -101,14 +100,13 @@ def test_avb_mmc_read(ubman): > """Test mmc read operation > """ > > - response = ubman.run_command('mmc rescan; mmc dev %s 0' % > - str(mmc_dev)) > + response = ubman.run_command('mmc rescan; mmc dev %d 0' % mmc_dev) > assert response.find('is current device') > > response = ubman.run_command('mmc read 0x%x 0x100 0x1' % temp_addr) > assert response.find('read: OK') > > - response = ubman.run_command('avb init %s' % str(mmc_dev)) > + response = ubman.run_command('avb init %x' % mmc_dev) > assert response == '' > > response = ubman.run_command('avb read_part xloader 0 100 0x%x' % > @@ -127,7 +125,7 @@ def test_avb_persistent_values(ubman): > """Test reading/writing persistent storage to avb > """ > > - response = ubman.run_command('avb init %s' % str(mmc_dev)) > + response = ubman.run_command('avb init %x' % mmc_dev) > assert response == '' > > response = ubman.run_command('avb write_pvalue test value_value') > > -- > 2.56.0 >
Reviewed-by: Igor Opaniuk <[email protected]>
