From cbad22f44238460be15603bf5f66c1f53a259f2d Mon Sep 17 00:00:00 2001 From: Zelin Hao Date: Thu, 14 Dec 2023 13:09:46 -0800 Subject: [PATCH] More tests for run_build class Signed-off-by: Zelin Hao --- src/run_build.py | 1 - tests/test_run_build.py | 9 +++++++++ tests/tests_build_workflow/test_build_incremental.py | 1 - 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/run_build.py b/src/run_build.py index e80e903e6b..55e1ccf994 100755 --- a/src/run_build.py +++ b/src/run_build.py @@ -48,7 +48,6 @@ def main() -> int: list_of_updated_plugins = buildIncremental.commits_diff(manifest) components = buildIncremental.rebuild_plugins(list_of_updated_plugins, manifest) logging.info(f"Plugins for incremental build: {components}") - # buildIncremental.build_incremental(args, manifest, ["common-utils"]) buildIncremental.build_incremental(args, manifest, components) return 0 diff --git a/tests/test_run_build.py b/tests/test_run_build.py index bdc862ad5f..73ed13e50a 100644 --- a/tests/test_run_build.py +++ b/tests/test_run_build.py @@ -229,3 +229,12 @@ def test_failed_plugins_default(self, mock_logging_error: Mock, mock_temp: Mock, with pytest.raises(Exception, match="Error during build"): main() mock_logging_error.assert_called_with(f"Error building common-utils, retry with: run_build.py {self.NON_OPENSEARCH_MANIFEST} --component common-utils") + + @patch("argparse._sys.argv", ["run_build.py", OPENSEARCH_MANIFEST, "--incremental"]) + @patch("run_build.BuildIncremental") + def test_main_incremental(self, mock_build_incremental: Mock, *mocks: Any) -> None: + main() + self.assertEqual(mock_build_incremental.call_count, 1) + mock_build_incremental.return_value.commits_diff.assert_called() + mock_build_incremental.return_value.rebuild_plugins.assert_called() + mock_build_incremental.return_value.build_incremental.assert_called() diff --git a/tests/tests_build_workflow/test_build_incremental.py b/tests/tests_build_workflow/test_build_incremental.py index a5c0d00547..324afa56d5 100644 --- a/tests/tests_build_workflow/test_build_incremental.py +++ b/tests/tests_build_workflow/test_build_incremental.py @@ -161,7 +161,6 @@ def test_rebuild_plugins_with_dashboards(self) -> None: self.assertTrue("OpenSearch-Dashboards" in rebuild_list) self.assertTrue("observabilityDashboards" in rebuild_list) - # @patch("argparse._sys.argv", ["run_build.py", INPUT_MANIFEST, "-p", "linux"]) @patch("os.path.join") @patch("build_workflow.build_incremental.Builders.builder_from", return_value=MagicMock()) @patch("build_workflow.build_incremental.BuildRecorder", return_value=MagicMock())