diff --git a/module_build_service/scheduler/batches.py b/module_build_service/scheduler/batches.py index 43140ff0..59179c2b 100644 --- a/module_build_service/scheduler/batches.py +++ b/module_build_service/scheduler/batches.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # SPDX-License-Identifier: MIT -import concurrent.futures import threading +import concurrent.futures from module_build_service import conf, log, models from module_build_service.db_session import db_session diff --git a/module_build_service/utils/greenwave.py b/module_build_service/scheduler/greenwave.py similarity index 99% rename from module_build_service/utils/greenwave.py rename to module_build_service/scheduler/greenwave.py index 66544cdf..1d2f52ff 100644 --- a/module_build_service/utils/greenwave.py +++ b/module_build_service/scheduler/greenwave.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- # SPDX-License-Identifier: MIT -import requests -import json from functools import reduce +import json + +import requests + from module_build_service import log, conf from module_build_service.errors import GreenwaveError diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py index 510b5b47..4c94bb6f 100644 --- a/module_build_service/scheduler/handlers/modules.py +++ b/module_build_service/scheduler/handlers/modules.py @@ -17,9 +17,9 @@ from module_build_service.utils import ( from module_build_service.db_session import db_session from module_build_service.builder import GenericBuilder from module_build_service.errors import UnprocessableEntity, Forbidden, ValidationError -from module_build_service.utils.greenwave import greenwave from module_build_service.scheduler.default_modules import ( add_default_modules, handle_collisions_with_base_module_rpms) +from module_build_service.scheduler.greenwave import greenwave from module_build_service.utils.submit import format_mmd from module_build_service.scheduler import events from module_build_service.utils.ursine import handle_stream_collision_modules diff --git a/module_build_service/scheduler/producer.py b/module_build_service/scheduler/producer.py index 6ac3a7c0..33d2a67a 100644 --- a/module_build_service/scheduler/producer.py +++ b/module_build_service/scheduler/producer.py @@ -12,13 +12,13 @@ import module_build_service.scheduler.consumer from module_build_service import celery_app, conf, models, log from module_build_service.builder import GenericBuilder from module_build_service.common.koji import get_session -from module_build_service.utils.greenwave import greenwave from module_build_service.db_session import db_session from module_build_service.scheduler.batches import ( at_concurrent_component_threshold, start_next_batch_build, ) from module_build_service.scheduler.consumer import ON_MODULE_CHANGE_HANDLERS +from module_build_service.scheduler.greenwave import greenwave from module_build_service.scheduler.handlers.components import build_task_finalize from module_build_service.scheduler.handlers.tags import tagged diff --git a/tests/test_build/test_build.py b/tests/test_build/test_build.py index 4342a119..dac994a2 100644 --- a/tests/test_build/test_build.py +++ b/tests/test_build/test_build.py @@ -452,7 +452,7 @@ class TestBuild(BaseTestBuild): FakeModuleBuilder.on_get_task_info_cb = on_get_task_info_cb self.p_check_gating = patch( - "module_build_service.utils.greenwave.Greenwave.check_gating", + "module_build_service.scheduler.greenwave.Greenwave.check_gating", return_value=True) self.mock_check_gating = self.p_check_gating.start() diff --git a/tests/test_utils/test_greenwave.py b/tests/test_scheduler/test_greenwave.py similarity index 94% rename from tests/test_utils/test_greenwave.py rename to tests/test_scheduler/test_greenwave.py index f1a3af19..6bd0d68f 100644 --- a/tests/test_utils/test_greenwave.py +++ b/tests/test_scheduler/test_greenwave.py @@ -1,9 +1,11 @@ # -*- coding: utf-8 -*- # SPDX-License-Identifier: MIT import json + from mock import patch, Mock import pytest -from module_build_service.utils.greenwave import greenwave + +from module_build_service.scheduler.greenwave import greenwave from tests import clean_database, make_module_in_db @@ -12,7 +14,7 @@ class TestGreenwaveQuery(): def setup_method(self, method): clean_database() - @patch("module_build_service.utils.greenwave.requests") + @patch("module_build_service.scheduler.greenwave.requests") def test_greenwave_query_decision(self, mock_requests): resp_status = 200 resp_content = { @@ -57,7 +59,7 @@ class TestGreenwaveQuery(): "https://greenwave.example.local/api/v1.0/decision" @pytest.mark.parametrize("return_all", (False, True)) - @patch("module_build_service.utils.greenwave.requests") + @patch("module_build_service.scheduler.greenwave.requests") def test_greenwave_query_policies(self, mock_requests, return_all): resp_status = 200 resp_content = { @@ -98,7 +100,7 @@ class TestGreenwaveQuery(): assert mock_requests.get.call_args_list[0][1]["url"] == \ "https://greenwave.example.local/api/v1.0/policies" - @patch("module_build_service.utils.greenwave.requests") + @patch("module_build_service.scheduler.greenwave.requests") def test_greenwave_get_product_versions(self, mock_requests): resp_status = 200 resp_content = { @@ -137,7 +139,7 @@ class TestGreenwaveQuery(): "https://greenwave.example.local/api/v1.0/policies" @pytest.mark.parametrize("policies_satisfied", (True, False)) - @patch("module_build_service.utils.greenwave.requests") + @patch("module_build_service.scheduler.greenwave.requests") def test_greenwave_check_gating(self, mock_requests, policies_satisfied): resp_status = 200 policies_content = { diff --git a/tests/test_scheduler/test_poller.py b/tests/test_scheduler/test_poller.py index e9851eef..92a657cb 100644 --- a/tests/test_scheduler/test_poller.py +++ b/tests/test_scheduler/test_poller.py @@ -556,7 +556,7 @@ class TestPoller: expected_tagged_calls, any_order=True) @pytest.mark.parametrize("greenwave_result", [True, False]) - @patch("module_build_service.utils.greenwave.Greenwave.check_gating") + @patch("module_build_service.scheduler.greenwave.Greenwave.check_gating") def test_poll_greenwave(self, mock_gw, create_builder, dbg, greenwave_result): module_build1 = models.ModuleBuild.get_by_id(db_session, 1)