From f0a126e66065f9884fadd8f68419bfe640ba918d Mon Sep 17 00:00:00 2001
From: Carlos Natalino <carlos.natalino@chalmers.se>
Date: Mon, 10 Jul 2023 12:29:08 +0000
Subject: [PATCH] Fixing tests for dbscanserving.
---
src/dbscanserving/.gitlab-ci.yml | 2 +-
src/dbscanserving/tests/test_unitary.py | 9 +++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/dbscanserving/.gitlab-ci.yml b/src/dbscanserving/.gitlab-ci.yml
index 5d5204cdd..d665bdaf2 100644
--- a/src/dbscanserving/.gitlab-ci.yml
+++ b/src/dbscanserving/.gitlab-ci.yml
@@ -54,7 +54,7 @@ unit_test dbscanserving:
- sleep 5
- docker ps -a
- docker logs $IMAGE_NAME
- - docker exec ps -a
+ - docker ps -a
- sleep 5
- docker logs $IMAGE_NAME
- docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/home/${IMAGE_NAME}/results/${IMAGE_NAME}_report.xml"
diff --git a/src/dbscanserving/tests/test_unitary.py b/src/dbscanserving/tests/test_unitary.py
index 7349978e5..a9d5c7e13 100644
--- a/src/dbscanserving/tests/test_unitary.py
+++ b/src/dbscanserving/tests/test_unitary.py
@@ -23,30 +23,27 @@ from common.proto.dbscanserving_pb2 import (DetectionRequest,
DetectionResponse, Sample)
from dbscanserving.client.DbscanServingClient import DbscanServingClient
-from dbscanserving.Config import GRPC_SERVICE_PORT
from dbscanserving.service.DbscanService import DbscanService
-port = 10000 + GRPC_SERVICE_PORT # avoid privileged ports
-
LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
@pytest.fixture(scope="session")
def dbscanserving_service():
- _service = DbscanService(port=port)
+ _service = DbscanService()
_service.start()
yield _service
_service.stop()
@pytest.fixture(scope="session")
-def dbscanserving_client():
+def dbscanserving_client(dbscanserving_service: DbscanService):
with patch.dict(
os.environ,
{
"DBSCANSERVINGSERVICE_SERVICE_HOST": "127.0.0.1",
- "DBSCANSERVINGSERVICE_SERVICE_PORT_GRPC": str(port),
+ "DBSCANSERVINGSERVICE_SERVICE_PORT_GRPC": str(dbscanserving_service.bind_port),
},
clear=True,
):
--
GitLab