From 9fbaf08c36387a6a7d21706675ae32202f2f08c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Scharnbo=CC=88ck?= Date: Wed, 8 Mar 2023 12:50:47 +0100 Subject: [PATCH 1/2] Ch: Sort passed_failed, to_classification_template and to_tests_overview --- flapy/results_parser.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/flapy/results_parser.py b/flapy/results_parser.py index 0d6afa6..310d5eb 100755 --- a/flapy/results_parser.py +++ b/flapy/results_parser.py @@ -350,6 +350,12 @@ def to_tests_overview(self) -> pd.DataFrame: test_overview["Test_nodeid_inclPara"] = ( test_overview["Test_nodeid"] + test_overview["Test_parametrization"] ) + + # Sort to ensure deterministic behaviour. Needs to use tuple in order to sort + test_overview["Verdicts_sameOrder"] = test_overview["Verdicts_sameOrder"].apply(tuple) + test_overview["Verdicts_randomOrder"] = test_overview["Verdicts_randomOrder"].apply(tuple) + test_overview.sort_values(["Verdicts_sameOrder", "Verdicts_randomOrder"], ascending=[True, True], inplace=True, key=tuple) + return test_overview def __repr__(self): @@ -385,6 +391,8 @@ def to_classification_template(self) -> pd.DataFrame: classification_template["Category"] = "" classification_template["Category sure? 1=yes 4=no"] = "" classification_template["Category comment"] = "" + + classification_template.sort_values(["Project_Name", "Project_URL", "Project_Hash", "Test_name"], ascending=[True, True, True, True], inplace=True) return classification_template def to_flapy_input( @@ -965,6 +973,9 @@ def get_passed_failed( passed_failed.insert(1, "Iteration_status", "ok") + # Sort to ensure deterministic behaviour + passed_failed.sort_values(["Passed_sameOrder", "Failed_sameOrder"], ascending=[True, True], inplace=True) + return passed_failed[ [ "Iteration", From e3110bc4653af9edeedf1b9e4657562e5463654d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Scharnbo=CC=88ck?= Date: Wed, 8 Mar 2023 13:00:47 +0100 Subject: [PATCH 2/2] Ch: Convert back to set for the tests to still pass. --- flapy/results_parser.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flapy/results_parser.py b/flapy/results_parser.py index 310d5eb..c029040 100755 --- a/flapy/results_parser.py +++ b/flapy/results_parser.py @@ -355,6 +355,8 @@ def to_tests_overview(self) -> pd.DataFrame: test_overview["Verdicts_sameOrder"] = test_overview["Verdicts_sameOrder"].apply(tuple) test_overview["Verdicts_randomOrder"] = test_overview["Verdicts_randomOrder"].apply(tuple) test_overview.sort_values(["Verdicts_sameOrder", "Verdicts_randomOrder"], ascending=[True, True], inplace=True, key=tuple) + test_overview["Verdicts_sameOrder"] = test_overview["Verdicts_sameOrder"].apply(set) + test_overview["Verdicts_randomOrder"] = test_overview["Verdicts_randomOrder"].apply(set) return test_overview