diff mbox series

[U-Boot,7/9] log: Add tests for the new log features

Message ID 20171228201423.128338-8-sjg@chromium.org
State Accepted
Commit aa4e0e005bfec08bcd0844ad043bba6226276474
Delegated to: Simon Glass
Headers show
Series log: Support control over the log output format | expand

Commit Message

Simon Glass Dec. 28, 2017, 8:14 p.m. UTC 
Add a test of the 'log format' and 'log rec' commands. This also covers
things like log_get_cat_by_name(), since they are used by these commands.
Fix a style nit in the tests also.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 test/py/tests/test_log.py | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

Comments

Simon Glass Jan. 26, 2018, 9:42 p.m. UTC | #1 
On 28 December 2017 at 13:14, Simon Glass <sjg@chromium.org> wrote:
> Add a test of the 'log format' and 'log rec' commands. This also covers
> things like log_get_cat_by_name(), since they are used by these commands.
> Fix a style nit in the tests also.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  test/py/tests/test_log.py | 28 +++++++++++++++++++++++++++-
>  1 file changed, 27 insertions(+), 1 deletion(-)
>

Applied to u-boot-dm.
diff mbox series

Patch

diff --git a/test/py/tests/test_log.py b/test/py/tests/test_log.py
index 517f415143..76f9236412 100644
--- a/test/py/tests/test_log.py
+++ b/test/py/tests/test_log.py
@@ -40,7 +40,6 @@  def test_log(u_boot_console):
         Returns:
             iterator containing the lines output from the command
         """
-
         with cons.log.section('basic'):
            output = u_boot_console.run_command('log test %d' % testnum)
         split = output.replace('\r', '').splitlines()
@@ -99,3 +98,30 @@  def test_log(u_boot_console):
     test7()
     test8()
     test9()
+
+@pytest.mark.buildconfigspec('log')
+def test_log_format(u_boot_console):
+    """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
+
+        Args:
+            fmt: Format to use for 'log format'
+            expected_output: Expected output from the 'log rec' command
+        """
+        output = cons.run_command('log format %s' % fmt)
+        assert output == ''
+        output = cons.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')
+        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('lm', 'NOTICE. msg')
+        run_with_format('m', 'msg')