modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-02-03 05:03:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move utils/ursine.py to scheduler/ursine.py

Browse Source
This commit is contained in:
mprahl
2020-01-03 11:21:32 -05:00
parent 2ce2e33431
commit a1dfeeb7e3
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module_build_service/scheduler/handlers/modules.py
View File

@@ -23,7 +23,7 @@ from module_build_service.scheduler.default_modules import (
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
from module_build_service.scheduler.ursine import handle_stream_collision_modules
from requests.exceptions import ConnectionError

0
module_build_service/utils/ursine.py → module_build_service/scheduler/ursine.py
View File

1
module_build_service/utils/__init__.py
View File

@@ -3,4 +3,3 @@
from module_build_service.utils.views import * # noqa
from module_build_service.utils.reuse import * # noqa
from module_build_service.utils.submit import * # noqa
from module_build_service.utils.ursine import * # noqa

12
tests/test_utils/test_ursine.py → tests/test_scheduler/test_ursine.py
View File

@@ -3,7 +3,7 @@
from mock import patch, Mock
from module_build_service import conf
from module_build_service.utils import ursine
from module_build_service.scheduler import ursine
from tests import make_module, make_module_in_db, clean_database
@@ -206,7 +206,7 @@ class TestRecordStreamCollisionModules:
assert original_xmd == fake_mmd.get_xmd()
@patch.object(conf, "base_module_names", new=["platform"])
@patch("module_build_service.utils.ursine.get_modulemds_from_ursine_content")
@patch("module_build_service.scheduler.ursine.get_modulemds_from_ursine_content")
def test_mark_handled_even_if_no_modules_in_ursine_content(
self, get_modulemds_from_ursine_content
):
@@ -233,7 +233,7 @@ class TestRecordStreamCollisionModules:
assert expected_xmd == fake_mmd.get_xmd()
@patch.object(conf, "base_module_names", new=["platform", "project-platform"])
@patch("module_build_service.utils.ursine.get_modulemds_from_ursine_content")
@patch("module_build_service.scheduler.ursine.get_modulemds_from_ursine_content")
@patch("module_build_service.resolver.GenericResolver.create")
@patch("koji.ClientSession")
def test_add_collision_modules(
@@ -324,14 +324,14 @@ class TestRecordStreamCollisionModules:
class TestFindStreamCollisionModules:
"""Test ursine.find_stream_collision_modules"""
@patch("module_build_service.utils.ursine.get_modulemds_from_ursine_content")
@patch("module_build_service.scheduler.ursine.get_modulemds_from_ursine_content")
def test_no_modulemds_found_from_ursine_content(
self, get_modulemds_from_ursine_content
):
get_modulemds_from_ursine_content.return_value = []
assert not ursine.find_stream_collision_modules({}, "koji_tag")
@patch("module_build_service.utils.ursine.get_modulemds_from_ursine_content")
@patch("module_build_service.scheduler.ursine.get_modulemds_from_ursine_content")
def test_no_collisions_found(self, get_modulemds_from_ursine_content):
xmd_mbs_buildrequires = {"modulea": {"stream": "master"}, "moduleb": {"stream": "10"}}
get_modulemds_from_ursine_content.return_value = [
@@ -342,7 +342,7 @@ class TestFindStreamCollisionModules:
assert [] == ursine.find_stream_collision_modules(
xmd_mbs_buildrequires, "koji_tag")
@patch("module_build_service.utils.ursine.get_modulemds_from_ursine_content")
@patch("module_build_service.scheduler.ursine.get_modulemds_from_ursine_content")
def test_collision_modules_are_found(self, get_modulemds_from_ursine_content):
xmd_mbs_buildrequires = {"modulea": {"stream": "master"}, "moduleb": {"stream": "10"}}
fake_modules = [