Skip to content
Snippets Groups Projects
Commit ac91877b authored by Yoann Schneider's avatar Yoann Schneider :tennis: Committed by Bastien Abadie
Browse files

Define api client in BaseWorker.__init__

parent ec2c8462
No related branches found
No related tags found
1 merge request!187Define api client in BaseWorker.__init__
Pipeline #79371 passed
......@@ -139,8 +139,6 @@ class ElementsWorker(
# CLI args are stored on the instance so that implementations can access them
self.args = self.parser.parse_args()
super().setup_api_client()
if self.is_read_only:
super().configure_for_developers()
else:
......
......@@ -125,6 +125,9 @@ class BaseWorker(object):
# is at least one available sqlite database either given or in the parent tasks
self.use_cache = False
# Define API Client
self.setup_api_client()
@property
def is_read_only(self) -> bool:
"""
......
......@@ -90,7 +90,6 @@ def test_init_var_worker_local_file(monkeypatch, tmp_path):
def test_cli_default(mocker, mock_worker_run_api):
worker = BaseWorker()
assert logger.level == logging.NOTSET
assert not hasattr(worker, "api_client")
mocker.patch.object(sys, "argv", ["worker"])
worker.args = worker.parser.parse_args()
......@@ -98,7 +97,6 @@ def test_cli_default(mocker, mock_worker_run_api):
assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234"
assert worker.worker_run_id == "56785678-5678-5678-5678-567856785678"
worker.setup_api_client()
worker.configure()
assert not worker.args.verbose
assert logger.level == logging.NOTSET
......@@ -111,7 +109,6 @@ def test_cli_default(mocker, mock_worker_run_api):
def test_cli_arg_verbose_given(mocker, mock_worker_run_api):
worker = BaseWorker()
assert logger.level == logging.NOTSET
assert not hasattr(worker, "api_client")
mocker.patch.object(sys, "argv", ["worker", "-v"])
worker.args = worker.parser.parse_args()
......@@ -119,7 +116,6 @@ def test_cli_arg_verbose_given(mocker, mock_worker_run_api):
assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234"
assert worker.worker_run_id == "56785678-5678-5678-5678-567856785678"
worker.setup_api_client()
worker.configure()
assert worker.args.verbose
assert logger.level == logging.DEBUG
......@@ -133,7 +129,6 @@ def test_cli_envvar_debug_given(mocker, monkeypatch, mock_worker_run_api):
worker = BaseWorker()
assert logger.level == logging.NOTSET
assert not hasattr(worker, "api_client")
mocker.patch.object(sys, "argv", ["worker"])
monkeypatch.setenv("ARKINDEX_DEBUG", True)
worker.args = worker.parser.parse_args()
......@@ -141,7 +136,6 @@ def test_cli_envvar_debug_given(mocker, monkeypatch, mock_worker_run_api):
assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234"
assert worker.worker_run_id == "56785678-5678-5678-5678-567856785678"
worker.setup_api_client()
worker.configure()
assert logger.level == logging.DEBUG
assert worker.api_client
......@@ -215,7 +209,6 @@ def test_configure_worker_run(mocker, monkeypatch, responses):
assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234"
assert worker.worker_run_id == "56785678-5678-5678-5678-567856785678"
worker.setup_api_client()
worker.configure()
assert worker.user_configuration == {"a": "b"}
......@@ -274,7 +267,6 @@ def test_configure_user_configuration_defaults(
content_type="application/json",
)
worker.setup_api_client()
worker.configure()
assert worker.config == {"param_1": "/some/path/file.pth", "param_2": 12}
......@@ -328,7 +320,6 @@ def test_configure_user_config_debug(mocker, monkeypatch, responses, debug):
content_type="application/json",
)
worker.args = worker.parser.parse_args()
worker.setup_api_client()
worker.configure()
assert worker.user_configuration == {"debug": debug}
......@@ -376,7 +367,6 @@ def test_configure_worker_run_missing_conf(mocker, monkeypatch, responses):
content_type="application/json",
)
worker.args = worker.parser.parse_args()
worker.setup_api_client()
worker.configure()
assert worker.user_configuration is None
......
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