From a1dfeeb7e3de19e1b9dfe947fab7fbfd2eecbe8e Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: Fri, 3 Jan 2020 11:21:32 -0500
Subject: [PATCH] Move utils/ursine.py to scheduler/ursine.py

---
 module_build_service/scheduler/handlers/modules.py  |  2 +-
 module_build_service/{utils => scheduler}/ursine.py |  0
 module_build_service/utils/__init__.py              |  1 -
 tests/{test_utils => test_scheduler}/test_ursine.py | 12 ++++++------
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename module_build_service/{utils => scheduler}/ursine.py (100%)
 rename tests/{test_utils => test_scheduler}/test_ursine.py (96%)

diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py
index d0d1aaa2..572b7a4e 100644
--- a/module_build_service/scheduler/handlers/modules.py
+++ b/module_build_service/scheduler/handlers/modules.py
@@ -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
 
diff --git a/module_build_service/utils/ursine.py b/module_build_service/scheduler/ursine.py
similarity index 100%
rename from module_build_service/utils/ursine.py
rename to module_build_service/scheduler/ursine.py
diff --git a/module_build_service/utils/__init__.py b/module_build_service/utils/__init__.py
index 565b544e..14de7bcb 100644
--- a/module_build_service/utils/__init__.py
+++ b/module_build_service/utils/__init__.py
@@ -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
diff --git a/tests/test_utils/test_ursine.py b/tests/test_scheduler/test_ursine.py
similarity index 96%
rename from tests/test_utils/test_ursine.py
rename to tests/test_scheduler/test_ursine.py
index 6e477f57..b4edbdaf 100644
--- a/tests/test_utils/test_ursine.py
+++ b/tests/test_scheduler/test_ursine.py
@@ -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 = [