From 752c3769874596d012cd8325099d2ae20123f989 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 9 Feb 2025 09:07:14 -0700 Subject: test/py: Shorten u_boot_console This fixture name is quite long and results in lots of verbose code. We know this is U-Boot so the 'u_boot_' part is not necessary. But it is also a bit of a misnomer, since it provides access to all the information available to tests. It is not just the console. It would be too confusing to use con as it would be confused with config and it is probably too short. So shorten it to 'ubman'. Signed-off-by: Simon Glass Link: https://lore.kernel.org/u-boot/CAFLszTgPa4aT_J9h9pqeTtLCVn4x2JvLWRcWRD8NaN3uoSAtyA@mail.gmail.com/ --- test/py/tests/test_sleep.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'test/py/tests/test_sleep.py') diff --git a/test/py/tests/test_sleep.py b/test/py/tests/test_sleep.py index 8965fc3fea9..f1bf34e05b2 100644 --- a/test/py/tests/test_sleep.py +++ b/test/py/tests/test_sleep.py @@ -19,43 +19,43 @@ env__sleep_margin = 0.25 """ -def test_sleep(u_boot_console): +def test_sleep(ubman): """Test the sleep command, and validate that it sleeps for approximately the correct amount of time.""" - sleep_skip = u_boot_console.config.env.get('env__sleep_accurate', True) + sleep_skip = ubman.config.env.get('env__sleep_accurate', True) if not sleep_skip: pytest.skip('sleep is not accurate') - if u_boot_console.config.buildconfig.get('config_cmd_sleep', 'n') != 'y': + if ubman.config.buildconfig.get('config_cmd_sleep', 'n') != 'y': pytest.skip('sleep command not supported') # 3s isn't too long, but is enough to cross a few second boundaries. - sleep_time = u_boot_console.config.env.get('env__sleep_time', 3) - sleep_margin = u_boot_console.config.env.get('env__sleep_margin', 0.25) + sleep_time = ubman.config.env.get('env__sleep_time', 3) + sleep_margin = ubman.config.env.get('env__sleep_margin', 0.25) tstart = time.time() - u_boot_console.run_command('sleep %d' % sleep_time) + ubman.run_command('sleep %d' % sleep_time) tend = time.time() elapsed = tend - tstart assert elapsed >= (sleep_time - 0.01) - if not u_boot_console.config.gdbserver: + if not ubman.config.gdbserver: # margin is hopefully enough to account for any system overhead. assert elapsed < (sleep_time + sleep_margin) @pytest.mark.buildconfigspec("cmd_time") -def test_time(u_boot_console): +def test_time(ubman): """Test the time command, and validate that it gives approximately the correct amount of command execution time.""" - sleep_skip = u_boot_console.config.env.get("env__sleep_accurate", True) + sleep_skip = ubman.config.env.get("env__sleep_accurate", True) if not sleep_skip: pytest.skip("sleep is not accurate") - sleep_time = u_boot_console.config.env.get("env__sleep_time", 10) - sleep_margin = u_boot_console.config.env.get("env__sleep_margin", 0.25) - output = u_boot_console.run_command("time sleep %d" % sleep_time) + sleep_time = ubman.config.env.get("env__sleep_time", 10) + sleep_margin = ubman.config.env.get("env__sleep_margin", 0.25) + output = ubman.run_command("time sleep %d" % sleep_time) execute_time = float(output.split()[1]) assert sleep_time >= (execute_time - 0.01) - if not u_boot_console.config.gdbserver: + if not ubman.config.gdbserver: # margin is hopefully enough to account for any system overhead. assert sleep_time < (execute_time + sleep_margin) -- cgit v1.2.3