Skip to content
Snippets Groups Projects
Commit f58ebd41 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Monitoring component:

- corrected imports and dependencies of unitary test
parent e497882f
No related branches found
No related tags found
2 merge requests!54Release 2.0.0,!34Context Scalability extensions using CockroachDB + Removal of Stateful database inside Device + other
...@@ -36,7 +36,6 @@ from common.tests.MockServicerImpl_Context import MockServicerImpl_Context ...@@ -36,7 +36,6 @@ from common.tests.MockServicerImpl_Context import MockServicerImpl_Context
from common.tools.service.GenericGrpcService import GenericGrpcService from common.tools.service.GenericGrpcService import GenericGrpcService
from common.tools.timestamp.Converters import timestamp_utcnow_to_float #, timestamp_string_to_float from common.tools.timestamp.Converters import timestamp_utcnow_to_float #, timestamp_string_to_float
from context.client.ContextClient import ContextClient from context.client.ContextClient import ContextClient
from context.service.ContextService import ContextService
from device.client.DeviceClient import DeviceClient from device.client.DeviceClient import DeviceClient
from device.service.DeviceService import DeviceService from device.service.DeviceService import DeviceService
from device.service.driver_api.DriverFactory import DriverFactory from device.service.driver_api.DriverFactory import DriverFactory
...@@ -78,8 +77,8 @@ METRICSDB_TABLE = os.environ.get('METRICSDB_TABLE') ...@@ -78,8 +77,8 @@ METRICSDB_TABLE = os.environ.get('METRICSDB_TABLE')
LOGGER = logging.getLogger(__name__) LOGGER = logging.getLogger(__name__)
class MockService_Dependencies(GenericGrpcService): class MockContextService(GenericGrpcService):
# Mock Service implementing Context and Device to simplify unitary tests of Monitoring # Mock Service implementing Context to simplify unitary tests of Monitoring
def __init__(self, bind_port: Union[str, int]) -> None: def __init__(self, bind_port: Union[str, int]) -> None:
super().__init__(bind_port, LOCAL_HOST, enable_health_servicer=False, cls_name='MockService') super().__init__(bind_port, LOCAL_HOST, enable_health_servicer=False, cls_name='MockService')
...@@ -95,20 +94,20 @@ class MockService_Dependencies(GenericGrpcService): ...@@ -95,20 +94,20 @@ class MockService_Dependencies(GenericGrpcService):
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def context_service(): def context_service():
_service = MockService_Dependencies(MOCKSERVICE_PORT) _service = MockContextService(MOCKSERVICE_PORT)
_service.configure_env_vars() _service.configure_env_vars()
_service.start() _service.start()
yield _service yield _service
_service.stop() _service.stop()
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def context_client(context_service : ContextService): # pylint: disable=redefined-outer-name,unused-argument def context_client(context_service : MockContextService): # pylint: disable=redefined-outer-name,unused-argument
_client = ContextClient() _client = ContextClient()
yield _client yield _client
_client.close() _client.close()
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def device_service(context_service : ContextService): # pylint: disable=redefined-outer-name,unused-argument def device_service(context_service : MockContextService): # pylint: disable=redefined-outer-name,unused-argument
LOGGER.info('Initializing DeviceService...') LOGGER.info('Initializing DeviceService...')
driver_factory = DriverFactory(DRIVERS) driver_factory = DriverFactory(DRIVERS)
driver_instance_cache = DriverInstanceCache(driver_factory) driver_instance_cache = DriverInstanceCache(driver_factory)
...@@ -131,7 +130,7 @@ def device_client(device_service : DeviceService): # pylint: disable=redefined-o ...@@ -131,7 +130,7 @@ def device_client(device_service : DeviceService): # pylint: disable=redefined-o
# This fixture will be requested by test cases and last during testing session # This fixture will be requested by test cases and last during testing session
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def monitoring_service( def monitoring_service(
context_service : ContextService, # pylint: disable=redefined-outer-name,unused-argument context_service : MockContextService, # pylint: disable=redefined-outer-name,unused-argument
device_service : DeviceService # pylint: disable=redefined-outer-name,unused-argument device_service : DeviceService # pylint: disable=redefined-outer-name,unused-argument
): ):
LOGGER.info('Initializing MonitoringService...') LOGGER.info('Initializing MonitoringService...')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment