From 58a2f00e771e637880c81c89022aef2540095a72 Mon Sep 17 00:00:00 2001 From: Niko <70217952+ew3361zh@users.noreply.github.com> Date: Fri, 11 Sep 2026 08:59:45 -0400 Subject: [PATCH 01/12] removes deepdiff check on expected results update --- RUFAS/e2e_test_results_handler.py | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/RUFAS/e2e_test_results_handler.py b/RUFAS/e2e_test_results_handler.py index 775ee23cfb..96e28825a4 100644 --- a/RUFAS/e2e_test_results_handler.py +++ b/RUFAS/e2e_test_results_handler.py @@ -691,24 +691,24 @@ def update_expected_test_results(output_dir: Path, output_prefix: str) -> None: with open(expected_results_path, "r") as expected_results_file: expected_results = json.load(expected_results_file) - diff = DeepDiff( - expected_results["expected_results"], actual_results, ignore_order=True, verbose_level=2 - ) - is_difference_in_results: bool = False if (diff == {}) else True - if is_difference_in_results: - om.add_warning( - "End-to-end testing expected results different from new actual results", - f"Differences will be saved in {output_dir} for {path_set.domain} domain.", - info_map, - ) - save_path = output_dir / f"{path_set.domain}_update_diff.json" - om.dict_to_file_json(data_dict=diff, path=save_path) - else: - om.add_log( - "End-to-end testing expected results matched new actual results", - f"No differences detected in actual and expected results for {path_set.domain} domain.", - info_map, - ) + # diff = DeepDiff( + # expected_results["expected_results"], actual_results, ignore_order=True, verbose_level=2 + # ) + # is_difference_in_results: bool = False if (diff == {}) else True + # if is_difference_in_results: + # om.add_warning( + # "End-to-end testing expected results different from new actual results", + # f"Differences will be saved in {output_dir} for {path_set.domain} domain.", + # info_map, + # ) + # save_path = output_dir / f"{path_set.domain}_update_diff.json" + # om.dict_to_file_json(data_dict=diff, path=save_path) + # else: + # om.add_log( + # "End-to-end testing expected results matched new actual results", + # f"No differences detected in actual and expected results for {path_set.domain} domain.", + # info_map, + # ) minified_actual_results = Utility.make_serializable( actual_results, max_depth=om.JSON_OUTPUT_MAX_RECURSIVE_DEPTH ) From 22f9823faaa9858290562e8094a6d1a785cad3ee Mon Sep 17 00:00:00 2001 From: Niko <70217952+ew3361zh@users.noreply.github.com> Date: Fri, 11 Sep 2026 09:02:13 -0400 Subject: [PATCH 02/12] removes old code --- RUFAS/e2e_test_results_handler.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/RUFAS/e2e_test_results_handler.py b/RUFAS/e2e_test_results_handler.py index 96e28825a4..3dcdec696b 100644 --- a/RUFAS/e2e_test_results_handler.py +++ b/RUFAS/e2e_test_results_handler.py @@ -691,24 +691,6 @@ def update_expected_test_results(output_dir: Path, output_prefix: str) -> None: with open(expected_results_path, "r") as expected_results_file: expected_results = json.load(expected_results_file) - # diff = DeepDiff( - # expected_results["expected_results"], actual_results, ignore_order=True, verbose_level=2 - # ) - # is_difference_in_results: bool = False if (diff == {}) else True - # if is_difference_in_results: - # om.add_warning( - # "End-to-end testing expected results different from new actual results", - # f"Differences will be saved in {output_dir} for {path_set.domain} domain.", - # info_map, - # ) - # save_path = output_dir / f"{path_set.domain}_update_diff.json" - # om.dict_to_file_json(data_dict=diff, path=save_path) - # else: - # om.add_log( - # "End-to-end testing expected results matched new actual results", - # f"No differences detected in actual and expected results for {path_set.domain} domain.", - # info_map, - # ) minified_actual_results = Utility.make_serializable( actual_results, max_depth=om.JSON_OUTPUT_MAX_RECURSIVE_DEPTH ) From aec4fdc054fd4fa6e60b7ba63888730f7bb4c0d2 Mon Sep 17 00:00:00 2001 From: Niko <70217952+ew3361zh@users.noreply.github.com> Date: Fri, 11 Sep 2026 09:41:17 -0400 Subject: [PATCH 03/12] fixes unit testing --- tests/test_e2e_test_results_handler.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/test_e2e_test_results_handler.py b/tests/test_e2e_test_results_handler.py index c77f028d32..9f1a5adb4e 100644 --- a/tests/test_e2e_test_results_handler.py +++ b/tests/test_e2e_test_results_handler.py @@ -564,11 +564,8 @@ def test_update_expected_test_results( mock_move.assert_called_once_with(Path(expected_backup_path), results_path.expected_results_path) else: assert add_error.call_count == 0 - expected_log_count = 3 if should_update else 2 - assert add_log.call_count == expected_log_count + assert add_log.call_count == 1 mock_write_json.assert_called_once() - if diff: - add_warning.assert_called_once() else: assert add_error.call_count == 1 assert add_log.call_count == 1 From 31d9d2ae63b91057c48acac734984e5da5d20361 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 11 Sep 2026 13:55:10 +0000 Subject: [PATCH 04/12] Apply Black Formatting From 891bf69f846acb56236f76300f1d95782117bc09 Mon Sep 17 00:00:00 2001 From: ew3361zh Date: Fri, 11 Sep 2026 14:00:21 +0000 Subject: [PATCH 05/12] Update badges on README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ed66b0c6ba..bf233e94f3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Flake8](https://img.shields.io/badge/Flake8-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) +[![Flake8](https://img.shields.io/badge/Flake8-failed-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Pytest](https://img.shields.io/badge/Pytest-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Coverage](https://img.shields.io/badge/Coverage-99%25-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Mypy](https://img.shields.io/badge/Mypy-1164%20errors-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) From f15b2b7ee0170de170989cda196f5837a3da9c5c Mon Sep 17 00:00:00 2001 From: Niko <70217952+ew3361zh@users.noreply.github.com> Date: Fri, 11 Sep 2026 09:57:31 -0400 Subject: [PATCH 06/12] changelog --- changelog_WIP.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog_WIP.md b/changelog_WIP.md index 882ccd2dc7..fcc0c50d87 100644 --- a/changelog_WIP.md +++ b/changelog_WIP.md @@ -121,3 +121,4 @@ This **WIP Changelog** records development changes in progress and not yet inclu - [3235](https://github.com/RuminantFarmSystems/RuFaS/pull/3235) - [minor change] [Dependabot] [NoInputChange] [NoOutputChange] Updates file-target of dependabot-change PRs for tagging dev-team members for review. - [3256](https://github.com/RuminantFarmSystems/RuFaS/pull/3256) - [minor change] [Branch Alignment] [NoInputChange] [NoOutputChange] Aligning `dev` branch with bug-fixing code from PR 3214 that was merged into `test`. - [3260](https://github.com/RuminantFarmSystems/RuFaS/pull/3260) - [minor change] [OutputManager] [NoInputChange] [NoOutputChange] Removes duplicative `report` naming mechanism in `OutputManager`. +- [3275](https://github.com/RuminantFarmSystems/RuFaS/pull/3260) - [minor change] [E2E Testing] [NoInputChange] [NoOutputChange] Removes `deepdiff` check from the process to update e2e expected results. From 758369ea59110e4cd8d263aeb0c7e0348afc0189 Mon Sep 17 00:00:00 2001 From: Niko <70217952+ew3361zh@users.noreply.github.com> Date: Fri, 11 Sep 2026 10:02:26 -0400 Subject: [PATCH 07/12] fixes flake8 error --- tests/test_e2e_test_results_handler.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_e2e_test_results_handler.py b/tests/test_e2e_test_results_handler.py index 9f1a5adb4e..a80268e714 100644 --- a/tests/test_e2e_test_results_handler.py +++ b/tests/test_e2e_test_results_handler.py @@ -516,7 +516,6 @@ def test_update_expected_test_results( output_dir = Path("output_dir") mocker.patch("RUFAS.e2e_test_results_handler.OutputManager.__init__", return_value=None) add_log = mocker.patch("RUFAS.e2e_test_results_handler.OutputManager.add_log") - add_warning = mocker.patch("RUFAS.e2e_test_results_handler.OutputManager.add_warning") add_error = mocker.patch("RUFAS.e2e_test_results_handler.OutputManager.add_error") results_path = mocker.MagicMock() From 2c2fb4f482d49bc1ac80a66098aa4367c7c371db Mon Sep 17 00:00:00 2001 From: Niko <70217952+ew3361zh@users.noreply.github.com> Date: Fri, 11 Sep 2026 10:03:36 -0400 Subject: [PATCH 08/12] removes unused test fixture --- tests/test_e2e_test_results_handler.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/test_e2e_test_results_handler.py b/tests/test_e2e_test_results_handler.py index a80268e714..65c1307176 100644 --- a/tests/test_e2e_test_results_handler.py +++ b/tests/test_e2e_test_results_handler.py @@ -495,19 +495,18 @@ def test_filter_nested() -> None: @pytest.mark.parametrize( - "diff, should_update, matching_path, raise_exception", + "diff, matching_path, raise_exception", [ - ({}, False, "output_dir/actual_results.json", None), - ({"diff": "some_differences"}, True, "output_dir/actual_results.json", None), - ({}, False, None, None), - ({}, False, "output_dir/actual_results.json", IOError("File read error")), - ({}, False, "output_dir/actual_results.json", json.JSONDecodeError("Invalid JSON", doc="", pos=0)), + ({}, "output_dir/actual_results.json", None), + ({"diff": "some_differences"}, "output_dir/actual_results.json", None), + ({}, None, None), + ({}, "output_dir/actual_results.json", IOError("File read error")), + ({}, "output_dir/actual_results.json", json.JSONDecodeError("Invalid JSON", doc="", pos=0)), ], ) def test_update_expected_test_results( mocker: MockerFixture, diff: dict[str, str], - should_update: bool, matching_path: str | None, raise_exception: Exception | None, ) -> None: From 33df16470f3aa5c71ae787723f5abac51916028d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 11 Sep 2026 14:05:32 +0000 Subject: [PATCH 09/12] Apply Black Formatting From 33b09b50d09b19e434dd7fdfe517b0148243401e Mon Sep 17 00:00:00 2001 From: ew3361zh Date: Fri, 11 Sep 2026 14:10:19 +0000 Subject: [PATCH 10/12] Update badges on README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bf233e94f3..ed66b0c6ba 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Flake8](https://img.shields.io/badge/Flake8-failed-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) +[![Flake8](https://img.shields.io/badge/Flake8-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Pytest](https://img.shields.io/badge/Pytest-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Coverage](https://img.shields.io/badge/Coverage-99%25-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Mypy](https://img.shields.io/badge/Mypy-1164%20errors-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) From d081a8a0052ef5fb6c03d0e1b80aae9068877982 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 16 Sep 2026 15:22:27 +0000 Subject: [PATCH 11/12] Apply Black Formatting From cf881b0b4f81e46ef280cfd46e6f90b304c04c97 Mon Sep 17 00:00:00 2001 From: ew3361zh Date: Wed, 16 Sep 2026 15:26:27 +0000 Subject: [PATCH 12/12] Update badges on README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c58c0facf1..ed66b0c6ba 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Flake8](https://img.shields.io/badge/Flake8-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) -[![Pytest](https://img.shields.io/badge/Pytest-failed-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) -[![Coverage](https://img.shields.io/badge/Coverage-%25-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) +[![Pytest](https://img.shields.io/badge/Pytest-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) +[![Coverage](https://img.shields.io/badge/Coverage-99%25-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml) [![Mypy](https://img.shields.io/badge/Mypy-1164%20errors-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml)