test/py: Drop assigning ubman to cons

Now that we have a shorter name, we don't need this sort of thing. Just
use ubman instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-02-09 09:07:17 -07:00
parent dd693ecb60
commit d08653d369
27 changed files with 436 additions and 468 deletions

View File

@@ -11,27 +11,26 @@ import utils
@pytest.mark.buildconfigspec('fit')
def test_source(ubman):
# Compile our test script image
cons = ubman
mkimage = os.path.join(cons.config.build_dir, 'tools/mkimage')
its = os.path.join(cons.config.source_dir, 'test/py/tests/source.its')
fit = os.path.join(cons.config.build_dir, 'source.itb')
utils.run_and_log(cons, (mkimage, '-f', its, fit))
cons.run_command(f'host load hostfs - $loadaddr {fit}')
mkimage = os.path.join(ubman.config.build_dir, 'tools/mkimage')
its = os.path.join(ubman.config.source_dir, 'test/py/tests/source.its')
fit = os.path.join(ubman.config.build_dir, 'source.itb')
utils.run_and_log(ubman, (mkimage, '-f', its, fit))
ubman.run_command(f'host load hostfs - $loadaddr {fit}')
assert '2' in cons.run_command('source')
assert '1' in cons.run_command('source :')
assert '1' in cons.run_command('source :script-1')
assert '2' in cons.run_command('source :script-2')
assert 'Fail' in cons.run_command('source :not-a-script || echo Fail')
assert '2' in cons.run_command('source \\#')
assert '1' in cons.run_command('source \\#conf-1')
assert '2' in cons.run_command('source \\#conf-2')
assert '2' in ubman.run_command('source')
assert '1' in ubman.run_command('source :')
assert '1' in ubman.run_command('source :script-1')
assert '2' in ubman.run_command('source :script-2')
assert 'Fail' in ubman.run_command('source :not-a-script || echo Fail')
assert '2' in ubman.run_command('source \\#')
assert '1' in ubman.run_command('source \\#conf-1')
assert '2' in ubman.run_command('source \\#conf-2')
cons.run_command('fdt addr $loadaddr')
cons.run_command('fdt rm /configurations default')
assert '1' in cons.run_command('source')
assert 'Fail' in cons.run_command('source \\# || echo Fail')
ubman.run_command('fdt addr $loadaddr')
ubman.run_command('fdt rm /configurations default')
assert '1' in ubman.run_command('source')
assert 'Fail' in ubman.run_command('source \\# || echo Fail')
cons.run_command('fdt rm /images default')
assert 'Fail' in cons.run_command('source || echo Fail')
assert 'Fail' in cons.run_command('source \\# || echo Fail')
ubman.run_command('fdt rm /images default')
assert 'Fail' in ubman.run_command('source || echo Fail')
assert 'Fail' in ubman.run_command('source \\# || echo Fail')