On 20 January 2016 at 15:15, Stephen Warren <swar...@wwwdotorg.org> wrote: > From: Stephen Warren <swar...@nvidia.com> > > Prior to this change, U-Boot was lazilly (re-)spawned if/when a test > attempted to interact with it, and no active connection existed. This > approach was simple, yet had the disadvantage that U-Boot might be > spawned in the middle of a test function, e.g. after the test had already > performed actions such as creating data files, etc. In that case, this > could cause the log to contain the sequence (1) some test logs, (2) > U-Boot's boot process, (3) the rest of that test's logs. This isn't > optimally readable. This issue will affect the upcoming DFU and enhanced > UMS tests. > > This change converts u_boot_console to be a function-scoped fixture, so > that pytest attempts to re-create the object for each test invocation. > This allows the fixture factory function to ensure that U-Boot is spawned > prior to every test. In practice, the same object is returned each time > so there is essentially no additional overhead due to this change. > > This allows us to remove: > > - The explicit ensure_spawned() call from test_sleep, since the core now > ensures that the spawn happens before the test code is executed. > > - The laxy calls to ensure_spawned() in the u_boot_console_* > implementations. > > The one downside is that test_env's "state_ttest_env" fixture must be > converted to a function-scoped fixture too, since a module-scoped fixture > cannot use a function-scoped fixture. To avoid overhead, we use the same > trick of returning the same object each time. > > Signed-off-by: Stephen Warren <swar...@nvidia.com> > --- > test/py/conftest.py | 3 ++- > test/py/tests/test_env.py | 8 ++++++-- > test/py/tests/test_sandbox_exit.py | 2 -- > test/py/tests/test_sleep.py | 4 ---- > test/py/u_boot_console_base.py | 2 -- > test/py/u_boot_console_sandbox.py | 1 - > 6 files changed, 8 insertions(+), 12 deletions(-)
Acked-by: Simon Glass <s...@chromium.org> _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
