SIENTIAPDE-1205
Refactor tests for async compatibility and enhance IngestorManager functionality - Updated test cases in `test_app.py`, `test_ingestor.py`, and `test_ingestor_manager.py` to use async/await syntax for improved concurrency. - Refactored methods in IngestorManager and related classes to support asynchronous operations, ensuring non-blocking behavior during execution. - Enhanced mock setups in tests to accommodate async methods, improving test reliability and performance.
This commit is contained in:
vitor-aignosi
@@ -1,7 +1,5 @@
|
||||
from unittest.mock import ANY, MagicMock, patch, call
|
||||
from os import getenv
|
||||
|
||||
from pytest import fixture
|
||||
from unittest.mock import ANY, AsyncMock, MagicMock, patch, call
|
||||
from pytest import fixture, mark
|
||||
from ingestor.ingestor import Ingestor
|
||||
|
||||
|
||||
@@ -74,12 +72,19 @@ def ingestor(_notification_handler, _getenv):
|
||||
|
||||
@fixture
|
||||
def ingestor_manager_started(ingestor):
|
||||
ingestor.ingestor_manager = MagicMock()
|
||||
ingestor.ingestor_manager = MagicMock(
|
||||
initialize_opc_from_config=AsyncMock(),
|
||||
shutdown=AsyncMock(),
|
||||
update_opc_servers=AsyncMock(),
|
||||
subscribe_to_tags=AsyncMock(),
|
||||
unsubscribe_slot=AsyncMock()
|
||||
)
|
||||
return ingestor
|
||||
|
||||
|
||||
def test_handle_acquired_tags_not_acquired(ingestor_manager_started):
|
||||
ingestor_manager_started.handle_acquired_tags([])
|
||||
@mark.asyncio
|
||||
async def test_handle_acquired_tags_not_acquired(ingestor_manager_started):
|
||||
await ingestor_manager_started.handle_acquired_tags([])
|
||||
|
||||
ingestor_manager_started.logger.warning.assert_called_once_with(
|
||||
"No slots available")
|
||||
@@ -87,8 +92,9 @@ def test_handle_acquired_tags_not_acquired(ingestor_manager_started):
|
||||
ingestor_manager_started.ingestor_manager.subscribe_to_tags.assert_not_called()
|
||||
|
||||
|
||||
def test_handle_acquired_tags_success(ingestor_manager_started):
|
||||
ingestor_manager_started.handle_acquired_tags(["tag1", "tag2"])
|
||||
@mark.asyncio
|
||||
async def test_handle_acquired_tags_success(ingestor_manager_started):
|
||||
await ingestor_manager_started.handle_acquired_tags(["tag1", "tag2"])
|
||||
|
||||
ingestor_manager_started.logger.warning.assert_not_called()
|
||||
ingestor_manager_started.ingestor_manager.update_opc_servers.assert_called_once()
|
||||
@@ -97,11 +103,14 @@ def test_handle_acquired_tags_success(ingestor_manager_started):
|
||||
|
||||
|
||||
@patch("ingestor.ingestor.IngestorManager")
|
||||
def test_prepare_ingestor(ingestor_manager_mock, ingestor):
|
||||
@mark.asyncio
|
||||
async def test_prepare_ingestor(ingestor_manager_mock, ingestor):
|
||||
ingestor_manager = ingestor_manager_mock.return_value
|
||||
ingestor_manager.get_slot_leases.return_value = True
|
||||
|
||||
ingestor.prepare_ingestor()
|
||||
ingestor.handle_acquired_tags = AsyncMock()
|
||||
|
||||
await ingestor.prepare_ingestor()
|
||||
|
||||
ingestor_manager_mock.assert_called_once_with(
|
||||
kafka_servers=ingestor.kafka_servers,
|
||||
@@ -124,7 +133,7 @@ def test_prepare_ingestor(ingestor_manager_mock, ingestor):
|
||||
ingestor_manager.declare_active.assert_called_once()
|
||||
ingestor_manager.get_slot_leases.assert_called_once()
|
||||
|
||||
ingestor.handle_acquired_tags(
|
||||
ingestor.handle_acquired_tags.assert_called_once_with(
|
||||
ingestor_manager.get_slot_leases.return_value)
|
||||
|
||||
|
||||
@@ -168,20 +177,22 @@ def test_manage_slots_none_available_none_available(ingestor_manager_started):
|
||||
1)
|
||||
|
||||
|
||||
def test_manage_leases_no_available_slots_no_extra_slots(ingestor_manager_started):
|
||||
@mark.asyncio
|
||||
async def test_manage_leases_no_available_slots_no_extra_slots(ingestor_manager_started):
|
||||
ingestor_manager_started.handle_acquired_tags = MagicMock()
|
||||
|
||||
ingestor_manager_started.manage_leases(0, 0, 0)
|
||||
await ingestor_manager_started.manage_leases(0, 0, 0)
|
||||
|
||||
ingestor_manager_started.ingestor_manager.get_slot_leases.assert_not_called()
|
||||
ingestor_manager_started.ingestor_manager.handle_acquired_tags.assert_not_called()
|
||||
ingestor_manager_started.ingestor_manager.drop_slot_leases.assert_not_called()
|
||||
|
||||
|
||||
def test_manage_leases_available_slots_innactive_ingestors(ingestor_manager_started):
|
||||
@mark.asyncio
|
||||
async def test_manage_leases_available_slots_innactive_ingestors(ingestor_manager_started):
|
||||
ingestor_manager_started.handle_acquired_tags = MagicMock()
|
||||
|
||||
ingestor_manager_started.manage_leases(2, 2, 5)
|
||||
await ingestor_manager_started.manage_leases(2, 2, 5)
|
||||
|
||||
ingestor_manager_started.ingestor_manager.get_slot_leases.assert_called_once_with(
|
||||
2)
|
||||
@@ -189,7 +200,8 @@ def test_manage_leases_available_slots_innactive_ingestors(ingestor_manager_star
|
||||
ingestor_manager_started.ingestor_manager.drop_slot_leases.assert_not_called()
|
||||
|
||||
|
||||
def test_manage_leases_no_available_slots_extra_sltos(ingestor_manager_started):
|
||||
@mark.asyncio
|
||||
async def test_manage_leases_no_available_slots_extra_sltos(ingestor_manager_started):
|
||||
ingestor_manager_started.handle_acquired_tags = MagicMock()
|
||||
ingestor_manager_started.ingestor_manager.managed_tags = {
|
||||
"tag1": "server1",
|
||||
@@ -197,7 +209,7 @@ def test_manage_leases_no_available_slots_extra_sltos(ingestor_manager_started):
|
||||
"tag3": "server3"
|
||||
}
|
||||
|
||||
ingestor_manager_started.manage_leases(0, 0, 2)
|
||||
await ingestor_manager_started.manage_leases(0, 0, 2)
|
||||
|
||||
ingestor_manager_started.ingestor_manager.get_slot_leases.assert_not_called()
|
||||
ingestor_manager_started.handle_acquired_tags.assert_not_called()
|
||||
@@ -205,9 +217,11 @@ def test_manage_leases_no_available_slots_extra_sltos(ingestor_manager_started):
|
||||
["tag2", "tag3"])
|
||||
|
||||
|
||||
def test_loop(ingestor_manager_started):
|
||||
@mark.asyncio
|
||||
async def test_loop(ingestor_manager_started):
|
||||
ingestor_manager_started.manage_no_slots = MagicMock()
|
||||
ingestor_manager_started.manage_leases = MagicMock()
|
||||
ingestor_manager_started.manage_leases = AsyncMock()
|
||||
ingestor_manager_started.update_ingestor_manager = AsyncMock()
|
||||
ingestor_manager_started.ingestor_manager.managed_tags = {
|
||||
"slot1": "server1",
|
||||
"slot2": "server2",
|
||||
@@ -220,7 +234,7 @@ def test_loop(ingestor_manager_started):
|
||||
ingestor_manager_started.ingestor_manager.get_number_of_leases = MagicMock(
|
||||
return_value=1)
|
||||
|
||||
ingestor_manager_started.loop()
|
||||
await ingestor_manager_started.loop()
|
||||
|
||||
ingestor_manager_started.ingestor_manager.declare_active.assert_called_once()
|
||||
ingestor_manager_started.ingestor_manager.get_active_ingestors.assert_called_once()
|
||||
@@ -234,16 +248,18 @@ def test_loop(ingestor_manager_started):
|
||||
ingestor_manager_started.ingestor_manager.update_slot_config.assert_called_once()
|
||||
|
||||
|
||||
def test_loop_no_managed(ingestor_manager_started):
|
||||
@mark.asyncio
|
||||
async def test_loop_no_managed(ingestor_manager_started):
|
||||
ingestor_manager_started.manage_no_slots = MagicMock()
|
||||
ingestor_manager_started.manage_leases = MagicMock()
|
||||
ingestor_manager_started.manage_leases = AsyncMock()
|
||||
ingestor_manager_started.update_ingestor_manager = AsyncMock()
|
||||
ingestor_manager_started.ingestor_manager.managed_tags = {}
|
||||
ingestor_manager_started.ingestor_manager.get_active_ingestors = MagicMock(
|
||||
return_value=["ingestor1", "ingestor2"])
|
||||
ingestor_manager_started.ingestor_manager.get_number_of_slots = MagicMock(
|
||||
return_value=5)
|
||||
|
||||
ingestor_manager_started.loop()
|
||||
await ingestor_manager_started.loop()
|
||||
|
||||
ingestor_manager_started.ingestor_manager.declare_active.assert_called_once()
|
||||
ingestor_manager_started.ingestor_manager.get_active_ingestors.assert_called_once()
|
||||
@@ -259,7 +275,8 @@ def test_loop_no_managed(ingestor_manager_started):
|
||||
"No slots acquired in this loop")
|
||||
|
||||
|
||||
def test_update_ingestor_manager(ingestor_manager_started):
|
||||
@mark.asyncio
|
||||
async def test_update_ingestor_manager(ingestor_manager_started):
|
||||
ingestor_manager_started.ingestor_manager.managed_tags = {
|
||||
"slot_to_create": "new_config",
|
||||
"slot_to_update": "new_config",
|
||||
@@ -272,7 +289,7 @@ def test_update_ingestor_manager(ingestor_manager_started):
|
||||
"slot_to_do_nothing": "old_config"
|
||||
}
|
||||
|
||||
ingestor_manager_started.update_ingestor_manager(old_managed_tags)
|
||||
await ingestor_manager_started.update_ingestor_manager(old_managed_tags)
|
||||
|
||||
ingestor_manager_started.ingestor_manager.update_opc_servers.assert_called_once()
|
||||
ingestor_manager_started.ingestor_manager.subscribe_to_tags.assert_has_calls(
|
||||
|
||||
Reference in New Issue
Block a user