[dpdk-dev] app/test: fix log check when default level is high

Message ID 1462368890-17917-1-git-send-email-thomas.monjalon@6wind.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Thomas Monjalon May 4, 2016, 1:34 p.m. UTC
  The log unit test was checking display of low priority messages.
It was not working if RTE_LOG_LEVEL is not RTE_LOG_DEBUG.
It is even easier to see since the default level is INFO (9b9d7ca).

Now the test use ERR and CRIT levels which should be always enabled
while not trigerring syslog output on the console.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 app/test/autotest_test_funcs.py | 20 ++++++++------------
 app/test/test_logs.c            | 20 +++++++++-----------
 2 files changed, 17 insertions(+), 23 deletions(-)
  

Comments

David Marchand May 17, 2016, 6:54 a.m. UTC | #1
Hello Thomas,

On Wed, May 4, 2016 at 3:34 PM, Thomas Monjalon
<thomas.monjalon@6wind.com> wrote:
> The log unit test was checking display of low priority messages.
> It was not working if RTE_LOG_LEVEL is not RTE_LOG_DEBUG.
> It is even easier to see since the default level is INFO (9b9d7ca).
>
> Now the test use ERR and CRIT levels which should be always enabled
> while not trigerring syslog output on the console.
>
> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
> ---
>  app/test/autotest_test_funcs.py | 20 ++++++++------------
>  app/test/test_logs.c            | 20 +++++++++-----------
>  2 files changed, 17 insertions(+), 23 deletions(-)
>
> diff --git a/app/test/autotest_test_funcs.py b/app/test/autotest_test_funcs.py
> index 0f012f6..f04909d 100644
> --- a/app/test/autotest_test_funcs.py
> +++ b/app/test/autotest_test_funcs.py
> @@ -145,18 +145,14 @@ def logs_autotest(child, test_name):
>         child.sendline(test_name)
>
>         log_list = [
> -               "TESTAPP1: this is a debug level message",
> -               "TESTAPP1: this is a info level message",
> -               "TESTAPP1: this is a warning level message",
> -               "TESTAPP2: this is a info level message",
> -               "TESTAPP2: this is a warning level message",
> -               "TESTAPP1: this is a debug level message",
> -               "TESTAPP1: this is a debug level message",
> -               "TESTAPP1: this is a info level message",
> -               "TESTAPP1: this is a warning level message",
> -               "TESTAPP2: this is a info level message",
> -               "TESTAPP2: this is a warning level message",
> -               "TESTAPP1: this is a debug level message",
> +               "TESTAPP1: error message",
> +               "TESTAPP1: critical message",
> +               "TESTAPP2: critical message",
> +               "TESTAPP1: error message",
> +               "TESTAPP1: error message",
> +               "TESTAPP1: critical message",
> +               "TESTAPP2: critical message",
> +               "TESTAPP1: error message",

Since this list is tighly coupled to test_logs.c, a little comment on
why the messages are declared twice in this list would help.

>         ]
>
>         for log_msg in log_list:
> diff --git a/app/test/test_logs.c b/app/test/test_logs.c
> index 18a3b6a..861cdff 100644
> --- a/app/test/test_logs.c
> +++ b/app/test/test_logs.c
> @@ -66,24 +66,22 @@ test_logs(void)
>         rte_set_log_type(RTE_LOGTYPE_TESTAPP2, 1);
>
>         /* log in debug level */
> -       rte_set_log_level(RTE_LOG_DEBUG);
> -       RTE_LOG(DEBUG, TESTAPP1, "this is a debug level message\n");
> -       RTE_LOG(INFO, TESTAPP1, "this is a info level message\n");
> -       RTE_LOG(WARNING, TESTAPP1, "this is a warning level message\n");
> +       rte_set_log_level(RTE_LOG_ERR);
> +       RTE_LOG(ERR, TESTAPP1, "error message\n");
> +       RTE_LOG(CRIT, TESTAPP1, "critical message\n");

Comment is wrong, should be about error level.

>
>         /* log in info level */
> -       rte_set_log_level(RTE_LOG_INFO);
> -       RTE_LOG(DEBUG, TESTAPP2, "debug level message (not displayed)\n");
> -       RTE_LOG(INFO, TESTAPP2, "this is a info level message\n");
> -       RTE_LOG(WARNING, TESTAPP2, "this is a warning level message\n");
> +       rte_set_log_level(RTE_LOG_CRIT);
> +       RTE_LOG(ERR, TESTAPP2, "error message (not displayed)\n");
> +       RTE_LOG(CRIT, TESTAPP2, "critical message\n");

Idem.

>
>         /* disable one log type */
>         rte_set_log_type(RTE_LOGTYPE_TESTAPP2, 0);
>
>         /* log in debug level */
> -       rte_set_log_level(RTE_LOG_DEBUG);
> -       RTE_LOG(DEBUG, TESTAPP1, "this is a debug level message\n");
> -       RTE_LOG(DEBUG, TESTAPP2, "debug level message (not displayed)\n");
> +       rte_set_log_level(RTE_LOG_ERR);
> +       RTE_LOG(ERR, TESTAPP1, "error message\n");
> +       RTE_LOG(ERR, TESTAPP2, "error message (not displayed)\n");

Idem.
  

Patch

diff --git a/app/test/autotest_test_funcs.py b/app/test/autotest_test_funcs.py
index 0f012f6..f04909d 100644
--- a/app/test/autotest_test_funcs.py
+++ b/app/test/autotest_test_funcs.py
@@ -145,18 +145,14 @@  def logs_autotest(child, test_name):
 	child.sendline(test_name)
 
 	log_list = [
-		"TESTAPP1: this is a debug level message",
-		"TESTAPP1: this is a info level message",
-		"TESTAPP1: this is a warning level message",
-		"TESTAPP2: this is a info level message",
-		"TESTAPP2: this is a warning level message",
-		"TESTAPP1: this is a debug level message",
-		"TESTAPP1: this is a debug level message",
-		"TESTAPP1: this is a info level message",
-		"TESTAPP1: this is a warning level message",
-		"TESTAPP2: this is a info level message",
-		"TESTAPP2: this is a warning level message",
-		"TESTAPP1: this is a debug level message",
+		"TESTAPP1: error message",
+		"TESTAPP1: critical message",
+		"TESTAPP2: critical message",
+		"TESTAPP1: error message",
+		"TESTAPP1: error message",
+		"TESTAPP1: critical message",
+		"TESTAPP2: critical message",
+		"TESTAPP1: error message",
 	]
 
 	for log_msg in log_list:
diff --git a/app/test/test_logs.c b/app/test/test_logs.c
index 18a3b6a..861cdff 100644
--- a/app/test/test_logs.c
+++ b/app/test/test_logs.c
@@ -66,24 +66,22 @@  test_logs(void)
 	rte_set_log_type(RTE_LOGTYPE_TESTAPP2, 1);
 
 	/* log in debug level */
-	rte_set_log_level(RTE_LOG_DEBUG);
-	RTE_LOG(DEBUG, TESTAPP1, "this is a debug level message\n");
-	RTE_LOG(INFO, TESTAPP1, "this is a info level message\n");
-	RTE_LOG(WARNING, TESTAPP1, "this is a warning level message\n");
+	rte_set_log_level(RTE_LOG_ERR);
+	RTE_LOG(ERR, TESTAPP1, "error message\n");
+	RTE_LOG(CRIT, TESTAPP1, "critical message\n");
 
 	/* log in info level */
-	rte_set_log_level(RTE_LOG_INFO);
-	RTE_LOG(DEBUG, TESTAPP2, "debug level message (not displayed)\n");
-	RTE_LOG(INFO, TESTAPP2, "this is a info level message\n");
-	RTE_LOG(WARNING, TESTAPP2, "this is a warning level message\n");
+	rte_set_log_level(RTE_LOG_CRIT);
+	RTE_LOG(ERR, TESTAPP2, "error message (not displayed)\n");
+	RTE_LOG(CRIT, TESTAPP2, "critical message\n");
 
 	/* disable one log type */
 	rte_set_log_type(RTE_LOGTYPE_TESTAPP2, 0);
 
 	/* log in debug level */
-	rte_set_log_level(RTE_LOG_DEBUG);
-	RTE_LOG(DEBUG, TESTAPP1, "this is a debug level message\n");
-	RTE_LOG(DEBUG, TESTAPP2, "debug level message (not displayed)\n");
+	rte_set_log_level(RTE_LOG_ERR);
+	RTE_LOG(ERR, TESTAPP1, "error message\n");
+	RTE_LOG(ERR, TESTAPP2, "error message (not displayed)\n");
 
 	rte_log_dump_history(stdout);