diff --git a/cloud/storage/core/tools/testing/access_service/lib/__init__.py b/cloud/storage/core/tools/testing/access_service/lib/__init__.py index cf415363340..00eca007cde 100644 --- a/cloud/storage/core/tools/testing/access_service/lib/__init__.py +++ b/cloud/storage/core/tools/testing/access_service/lib/__init__.py @@ -4,13 +4,13 @@ import contrib.ydb.tests.library.common.yatest_common as yatest_common -from contrib.ydb.tests.library.harness.daemon import Daemon +from cloud.storage.core.tools.common.python.daemon import Daemon from contrib.ydb.tests.library.harness.kikimr_runner import get_unique_path_for_current_test, ensure_path_exists logger = logging.getLogger(__name__) -class AccessService(Daemon): +class AccessService: def __init__(self, host, port, control_server_port): self.__host = host @@ -32,7 +32,11 @@ def __init__(self, host, port, control_server_port): "--port", str(self.__port), "--control-server-port", str(self.__control_server_port) ] - self.__daemon = Daemon(command=command, cwd=self.__cwd, timeout=180) + self.__daemon = Daemon( + commands=[command], + cwd=self.__cwd, + service_name="access_service", + ) def start(self): try: @@ -63,7 +67,7 @@ def stop(self): self.__daemon.stop() def __get_pid(self): - return self.__daemon.daemon.process.pid + return self.__daemon.pid def __url(self, path): return "{}/{}".format(self.__control_url, path) diff --git a/cloud/storage/core/tools/testing/access_service/lib/ya.make b/cloud/storage/core/tools/testing/access_service/lib/ya.make index 4f33e96fb85..be77c2f1cb1 100644 --- a/cloud/storage/core/tools/testing/access_service/lib/ya.make +++ b/cloud/storage/core/tools/testing/access_service/lib/ya.make @@ -5,6 +5,7 @@ PY_SRCS( ) PEERDIR( + cloud/storage/core/tools/common/python contrib/python/requests/py3 contrib/ydb/tests/library )