diff options
Diffstat (limited to 'test/py/tests/test_log.py')
| -rw-r--r-- | test/py/tests/test_log.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/test/py/tests/test_log.py b/test/py/tests/test_log.py index 140dcb9aa2b..4558b037e2a 100644 --- a/test/py/tests/test_log.py +++ b/test/py/tests/test_log.py @@ -11,7 +11,7 @@ and checks that the output is correct. import pytest @pytest.mark.buildconfigspec('cmd_log') -def test_log_format(u_boot_console): +def test_log_format(ubman): """Test the 'log format' and 'log rec' commands""" def run_with_format(fmt, expected_output): """Set up the log format and then write a log record @@ -20,29 +20,30 @@ def test_log_format(u_boot_console): fmt: Format to use for 'log format' expected_output: Expected output from the 'log rec' command """ - output = cons.run_command('log format %s' % fmt) + output = ubman.run_command('log format %s' % fmt) assert output == '' - output = cons.run_command('log rec arch notice file.c 123 func msg') + output = ubman.run_command('log rec arch notice file.c 123 func msg') assert output == expected_output - cons = u_boot_console - with cons.log.section('format'): - run_with_format('all', 'NOTICE.arch,file.c:123-func() msg') - output = cons.run_command('log format') + with ubman.log.section('format'): + pad = int(ubman.config.buildconfig.get('config_logf_func_pad')) + padding = ' ' * (pad - len('func')) + + run_with_format('all', f'NOTICE.arch,file.c:123-{padding}func() msg') + output = ubman.run_command('log format') assert output == 'Log format: clFLfm' - run_with_format('fm', 'func() msg') - run_with_format('clfm', 'NOTICE.arch,func() msg') - run_with_format('FLfm', 'file.c:123-func() msg') + run_with_format('fm', f'{padding}func() msg') + run_with_format('clfm', f'NOTICE.arch,{padding}func() msg') + run_with_format('FLfm', f'file.c:123-{padding}func() msg') run_with_format('lm', 'NOTICE. msg') run_with_format('m', 'msg') @pytest.mark.buildconfigspec('debug_uart') @pytest.mark.boardspec('sandbox') -def test_log_dropped(u_boot_console): +def test_log_dropped(ubman): """Test dropped 'log' message when debug_uart is activated""" - cons = u_boot_console - cons.restart_uboot() - output = cons.get_spawn_output().replace('\r', '') + ubman.restart_uboot() + output = ubman.get_spawn_output().replace('\r', '') assert (not 'debug: main' in output) |