diff mbox

[U-Boot] test/py: put "Starting U-Boot" into separate log section

Message ID 1455216372-27595-1-git-send-email-swarren@wwwdotorg.org
State Accepted
Commit 9725543843d23bd6ba3a37b90bbbb8c1303e39ea
Delegated to: Tom Rini
Headers show

Commit Message

Stephen Warren Feb. 11, 2016, 6:46 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

The initial boot of U-Boot happens within the context of the first test
that needs to access the U-Boot console when there is no existing
connection. This keeps all activity nestled within test execution, which
fits well into the pytest model. However, this mingles the U-Boot startup
logs with the execution of some test(s), which hides find the boundary
between the two.

To solve this, wrap the "Starting U-Boot" logic into a separate log
section. If the user wishes, they can simply collapse this log section
when viewing the HTML log, to concentrate purely on the test's own
interaction.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 test/py/u_boot_console_base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Simon Glass Feb. 15, 2016, 1:20 a.m. UTC | #1 
On 11 February 2016 at 11:46, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> The initial boot of U-Boot happens within the context of the first test
> that needs to access the U-Boot console when there is no existing
> connection. This keeps all activity nestled within test execution, which
> fits well into the pytest model. However, this mingles the U-Boot startup
> logs with the execution of some test(s), which hides find the boundary
> between the two.
>
> To solve this, wrap the "Starting U-Boot" logic into a separate log
> section. If the user wishes, they can simply collapse this log section
> when viewing the HTML log, to concentrate purely on the test's own
> interaction.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
>  test/py/u_boot_console_base.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Acked-by: Simon Glass <sjg@chromium.org>
Tom Rini Feb. 15, 2016, 10:37 p.m. UTC | #2 
On Thu, Feb 11, 2016 at 11:46:12AM -0700, Stephen Warren wrote:

> From: Stephen Warren <swarren@nvidia.com>
> 
> The initial boot of U-Boot happens within the context of the first test
> that needs to access the U-Boot console when there is no existing
> connection. This keeps all activity nestled within test execution, which
> fits well into the pytest model. However, this mingles the U-Boot startup
> logs with the execution of some test(s), which hides find the boundary
> between the two.
> 
> To solve this, wrap the "Starting U-Boot" logic into a separate log
> section. If the user wishes, they can simply collapse this log section
> when viewing the HTML log, to concentrate purely on the test's own
> interaction.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py
index 58575704adf5..bc2bd767e40e 100644
--- a/test/py/u_boot_console_base.py
+++ b/test/py/u_boot_console_base.py
@@ -293,8 +293,8 @@  class ConsoleBase(object):
         if self.p:
             return
         try:
+            self.log.start_section('Starting U-Boot')
             self.at_prompt = False
-            self.log.action('Starting U-Boot')
             self.p = self.get_spawn()
             # Real targets can take a long time to scroll large amounts of
             # text if LCD is enabled. This value may need tweaking in the
@@ -329,6 +329,8 @@  class ConsoleBase(object):
             self.log.error(str(ex))
             self.cleanup_spawn()
             raise
+        finally:
+            self.log.end_section('Starting U-Boot')
 
     def cleanup_spawn(self):
         """Shut down all interaction with the U-Boot instance.