Refactor tests for proper collection

NeonGeckoCom · Dec 6, 2023 · 5614fe6 · 5614fe6
1 parent 978e862
commit 5614fe6
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 39 deletions.
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
diff --git a/tests/chatbot_objects.py → tests/integration/chatbot_objects.py b/tests/chatbot_objects.py → tests/integration/chatbot_objects.py
diff --git a/tests/integration/chatbot_core_tests.py → tests/integration/test_chatbot_core.py b/tests/integration/chatbot_core_tests.py → tests/integration/test_chatbot_core.py
@@ -26,14 +26,14 @@
 
 from chatbot_core.utils.enum import ConversationControls, ConversationState
 from chatbot_core.utils.bot_utils import clean_up_bot
-from ..chatbot_objects import *
+from .chatbot_objects import *
 
 
 SERVER = "0.0.0.0"
 
 
 @pytest.mark.timeout(timeout=300, method='signal')
-class ChatbotCoreTests(unittest.TestCase):
+class TestChatbotCore(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls) -> None:
@@ -192,7 +192,7 @@ def test_15_histories_length(self):
 
     @pytest.mark.timeout(30)
     def test_messagebus_connection(self):
-        from chatbot_core.utils import init_message_bus
+        from chatbot_core.utils.bot_utils import init_message_bus
         from threading import Thread
         from mycroft_bus_client import MessageBusClient
 

diff --git a/tests/units/__init__.py b/tests/units/__init__.py
diff --git a/tests/units/base_class_tests.py → tests/units/test_base_classes.py b/tests/units/base_class_tests.py → tests/units/test_base_classes.py
diff --git a/tests/units/init_tests.py → tests/units/test_init.py b/tests/units/init_tests.py → tests/units/test_init.py
diff --git a/tests/units/utils_tests.py → tests/units/test_utils.py b/tests/units/utils_tests.py → tests/units/test_utils.py