mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 14:41:31 +00:00
636f38d83a
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 <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
78 lines
1.9 KiB
Python
78 lines
1.9 KiB
Python
# Copyright (c) 2015 Stephen Warren
|
|
# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
# Logic to interact with the sandbox port of U-Boot, running as a sub-process.
|
|
|
|
import time
|
|
from u_boot_spawn import Spawn
|
|
from u_boot_console_base import ConsoleBase
|
|
|
|
class ConsoleSandbox(ConsoleBase):
|
|
'''Represents a connection to a sandbox U-Boot console, executed as a sub-
|
|
process.'''
|
|
|
|
def __init__(self, log, config):
|
|
'''Initialize a U-Boot console connection.
|
|
|
|
Args:
|
|
log: A multiplexed_log.Logfile instance.
|
|
config: A "configuration" object as defined in conftest.py.
|
|
|
|
Returns:
|
|
Nothing.
|
|
'''
|
|
|
|
super(ConsoleSandbox, self).__init__(log, config, max_fifo_fill=1024)
|
|
|
|
def get_spawn(self):
|
|
'''Connect to a fresh U-Boot instance.
|
|
|
|
A new sandbox process is created, so that U-Boot begins running from
|
|
scratch.
|
|
|
|
Args:
|
|
None.
|
|
|
|
Returns:
|
|
A u_boot_spawn.Spawn object that is attached to U-Boot.
|
|
'''
|
|
|
|
return Spawn([self.config.build_dir + '/u-boot'])
|
|
|
|
def kill(self, sig):
|
|
'''Send a specific Unix signal to the sandbox process.
|
|
|
|
Args:
|
|
sig: The Unix signal to send to the process.
|
|
|
|
Returns:
|
|
Nothing.
|
|
'''
|
|
|
|
self.log.action('kill %d' % sig)
|
|
self.p.kill(sig)
|
|
|
|
def validate_exited(self):
|
|
'''Determine whether the sandbox process has exited.
|
|
|
|
If required, this function waits a reasonable time for the process to
|
|
exit.
|
|
|
|
Args:
|
|
None.
|
|
|
|
Returns:
|
|
Boolean indicating whether the process has exited.
|
|
'''
|
|
|
|
p = self.p
|
|
self.p = None
|
|
for i in xrange(100):
|
|
ret = not p.isalive()
|
|
if ret:
|
|
break
|
|
time.sleep(0.1)
|
|
p.close()
|
|
return ret
|