Commit 0a446240 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-release CI/CD pipeline fixes

parent 051bd585

src/service/tests/PrepareTestScenario.py

+12 −10
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ from service.client.ServiceClient import ServiceClient 
from service.service.ServiceService import ServiceService

from service.service.ServiceService import ServiceService

from service.service.service_handler_api.ServiceHandlerFactory import ServiceHandlerFactory

from service.service.service_handler_api.ServiceHandlerFactory import ServiceHandlerFactory

from service.service.service_handlers import SERVICE_HANDLERS

from service.service.service_handlers import SERVICE_HANDLERS

from service.tests.MockService_Dependencies import MockService_Dependencies

#from service.tests.MockService_Dependencies import MockService_Dependencies





LOCAL_HOST = '127.0.0.1'

LOCAL_HOST = '127.0.0.1'

MOCKSERVICE_PORT = 10000

MOCKSERVICE_PORT = 10000
@@ -30,22 +30,24 @@ SERVICE_SERVICE_PORT = MOCKSERVICE_PORT + int(get_service_port_grpc(ServiceNameE 
os.environ[get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_HOST     )] = str(LOCAL_HOST)

os.environ[get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_HOST     )] = str(LOCAL_HOST)

os.environ[get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(SERVICE_SERVICE_PORT)

os.environ[get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(SERVICE_SERVICE_PORT)





@pytest.fixture(scope='session')

#@pytest.fixture(scope='session')

def mock_service():

#def mock_service():

    _service = MockService_Dependencies(MOCKSERVICE_PORT)

#    _service = MockService_Dependencies(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(mock_service : MockService_Dependencies): # pylint: disable=redefined-outer-name

#def context_client(mock_service : MockService_Dependencies): # pylint: disable=redefined-outer-name

def context_client():

    _client = ContextClient()

    _client = ContextClient()

    yield _client

    yield _client

    _client.close()

    _client.close()





@pytest.fixture(scope='session')

@pytest.fixture(scope='session')

def device_client(mock_service : MockService_Dependencies): # pylint: disable=redefined-outer-name

#def device_client(mock_service : MockService_Dependencies): # pylint: disable=redefined-outer-name

def device_client():

    _client = DeviceClient()

    _client = DeviceClient()

    yield _client

    yield _client

    _client.close()

    _client.close()