diff mbox series

[V2,2/2] framework/dts: fix result output by merging cases when parsing execution requirements.

Message ID 20230315015655.768885-3-ke1.xu@intel.com (mailing list archive)
State Accepted
Headers
Series fix result output overwriting when using multiple lines in execution configuration for one suite. |

Checks

Context Check Description
ci/Intel-dts-format-test success Testing OK
ci/Intel-dts-pylama-test success Testing OK
ci/Intel-dts-suite-test success Testing OK

Commit Message

Ke Xu March 15, 2023, 1:56 a.m. UTC 
In execution config, multi-run suites and cases are grammarly allowed.
 When we call for a suite multiple times, the new result will overwrite
 the old result totally.

This fix merges duplicated lines for suites when parsing the execution
 configuration, preventing the potential multiple run of suites and
 cases.

Signed-off-by: Ke Xu <ke1.xu@intel.com>
---
 framework/dts.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

Comments

Tu, Lijuan March 28, 2023, 12:54 a.m. UTC | #1 
On Wed, 15 Mar 2023 09:56:55 +0800, Ke Xu <ke1.xu@intel.com> wrote:
> In execution config, multi-run suites and cases are grammarly allowed.
>  When we call for a suite multiple times, the new result will overwrite
>  the old result totally.
> 
> This fix merges duplicated lines for suites when parsing the execution
>  configuration, preventing the potential multiple run of suites and
>  cases.
> 
> Signed-off-by: Ke Xu <ke1.xu@intel.com>


Series applied, thanks
diff mbox series

Patch

diff --git a/framework/dts.py b/framework/dts.py
index a8e670b5..b55aed90 100644
--- a/framework/dts.py
+++ b/framework/dts.py
@@ -149,9 +149,32 @@  def dts_parse_config(config, section):
     settings.save_global_setting(settings.DPDK_RXMODE_SETTING, rx_mode)
     settings.save_global_setting(settings.DPDK_DCFMODE_SETTING, dcf_mode)
 
+    suite_list_dedup = {}
+    ## suite_list_dedup[suite_name] := { True | Set | ... }
+    ## True := All Cases to Run
+    ## Set := Listed Cases to Run
     for suite in test_suites:
         if suite == "":
-            test_suites.remove(suite)
+            pass
+        elif ":" in suite:
+            suite_name = suite[: suite.find(":")]
+            case_list_str = suite[suite.find(":") + 1 :]
+            case_list = case_list_str.split("\\")
+            if not suite_name in suite_list_dedup:
+                suite_list_dedup[suite_name] = set()
+            if isinstance(suite_list_dedup[suite_name], set):
+                suite_list_dedup[suite_name].update(case_list)
+            elif suite_list_dedup[suite_name] == True:
+                pass
+        else:
+            suite_list_dedup[suite] = True
+
+    test_suites = []
+    for suite in suite_list_dedup:
+        if suite_list_dedup[suite] == True:
+            test_suites.append(suite)
+        elif isinstance(suite_list_dedup[suite], set) and suite_list_dedup[suite]:
+            test_suites.append(suite + ":" + "\\".join(suite_list_dedup[suite]))
 
     return duts, targets, test_suites