Skip to content
Snippets Groups Projects
Commit 56cdbf31 authored by Nolan's avatar Nolan Committed by Yoann Schneider
Browse files

Remove the self.features from elementsWorker as well as its associated tests

parent 02322074
No related branches found
No related tags found
1 merge request!177Remove the self.features from elementsWorker as well as its associated tests
Pipeline #79278 passed
...@@ -148,11 +148,6 @@ class BaseWorker(object): ...@@ -148,11 +148,6 @@ class BaseWorker(object):
self.api_client = ArkindexClient(**options_from_env()) self.api_client = ArkindexClient(**options_from_env())
logger.debug(f"Setup Arkindex API client on {self.api_client.document.url}") logger.debug(f"Setup Arkindex API client on {self.api_client.document.url}")
# Load features available on backend, and check authentication
user = self.request("RetrieveUser")
logger.debug(f"Connected as {user['display_name']} - {user['email']}")
self.features = user["features"]
# Load process information except in developer mode # Load process information except in developer mode
if not self.args.dev: if not self.args.dev:
assert os.environ.get( assert os.environ.get(
......
...@@ -109,7 +109,7 @@ def give_env_variable(request, monkeypatch): ...@@ -109,7 +109,7 @@ def give_env_variable(request, monkeypatch):
@pytest.fixture @pytest.fixture
def mock_config_api(mock_worker_version_api, mock_process_api, mock_user_api): def mock_config_api(mock_worker_version_api, mock_process_api):
"""Mock all API endpoints required to configure a worker""" """Mock all API endpoints required to configure a worker"""
pass pass
...@@ -223,29 +223,6 @@ def mock_process_api(responses): ...@@ -223,29 +223,6 @@ def mock_process_api(responses):
) )
@pytest.fixture
def mock_user_api(responses):
"""
Provide a mock API response to retrieve user details
Signup is disabled in this mock
"""
payload = {
"id": 1,
"email": "bot@teklia.com",
"display_name": "Bender",
"features": {
"signup": False,
},
}
responses.add(
responses.GET,
"http://testserver/api/v1/user/",
status=200,
body=json.dumps(payload),
content_type="application/json",
)
@pytest.fixture @pytest.fixture
def mock_activity_calls(responses): def mock_activity_calls(responses):
""" """
......
...@@ -45,9 +45,7 @@ def test_init_var_ponos_data_given(monkeypatch): ...@@ -45,9 +45,7 @@ def test_init_var_ponos_data_given(monkeypatch):
assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234" assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234"
def test_init_var_worker_version_id_missing( def test_init_var_worker_version_id_missing(monkeypatch, mock_process_api):
monkeypatch, mock_user_api, mock_process_api
):
monkeypatch.setattr(sys, "argv", ["worker"]) monkeypatch.setattr(sys, "argv", ["worker"])
monkeypatch.delenv("WORKER_VERSION_ID") monkeypatch.delenv("WORKER_VERSION_ID")
worker = BaseWorker() worker = BaseWorker()
...@@ -57,9 +55,7 @@ def test_init_var_worker_version_id_missing( ...@@ -57,9 +55,7 @@ def test_init_var_worker_version_id_missing(
assert worker.config == {} # default empty case assert worker.config == {} # default empty case
def test_init_var_worker_local_file( def test_init_var_worker_local_file(monkeypatch, tmp_path, mock_process_api):
monkeypatch, tmp_path, mock_user_api, mock_process_api
):
# Build a dummy yaml config file # Build a dummy yaml config file
config = tmp_path / "config.yml" config = tmp_path / "config.yml"
config.write_text("---\nlocalKey: abcdef123") config.write_text("---\nlocalKey: abcdef123")
...@@ -137,9 +133,7 @@ def test_cli_envvar_debug_given(mocker, monkeypatch, mock_config_api): ...@@ -137,9 +133,7 @@ def test_cli_envvar_debug_given(mocker, monkeypatch, mock_config_api):
logger.setLevel(logging.NOTSET) logger.setLevel(logging.NOTSET)
def test_configure_dev_mode( def test_configure_dev_mode(mocker, monkeypatch, mock_worker_version_api):
mocker, monkeypatch, mock_user_api, mock_worker_version_api
):
""" """
Configuring a worker in developer mode avoid retrieving process information Configuring a worker in developer mode avoid retrieving process information
""" """
...@@ -182,7 +176,6 @@ def test_configure_user_configuration_defaults( ...@@ -182,7 +176,6 @@ def test_configure_user_configuration_defaults(
mocker, mocker,
monkeypatch, monkeypatch,
mock_worker_version_user_configuration_api, mock_worker_version_user_configuration_api,
mock_user_api,
mock_process_api, mock_process_api,
responses, responses,
): ):
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# API calls during worker configuration # API calls during worker configuration
BASE_API_CALLS = [ BASE_API_CALLS = [
("GET", "http://testserver/api/v1/user/"),
("GET", "http://testserver/api/v1/imports/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff/"), ("GET", "http://testserver/api/v1/imports/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff/"),
( (
"GET", "GET",
......
...@@ -79,9 +79,7 @@ def test_readonly(responses, mock_elements_worker): ...@@ -79,9 +79,7 @@ def test_readonly(responses, mock_elements_worker):
] == BASE_API_CALLS ] == BASE_API_CALLS
def test_activities_disabled( def test_activities_disabled(responses, monkeypatch, mock_worker_version_api):
responses, monkeypatch, mock_worker_version_api, mock_user_api
):
"""Test worker process elements without updating activities when they are disabled for the process""" """Test worker process elements without updating activities when they are disabled for the process"""
responses.add( responses.add(
responses.GET, responses.GET,
...@@ -101,7 +99,7 @@ def test_activities_disabled( ...@@ -101,7 +99,7 @@ def test_activities_disabled(
] == BASE_API_CALLS ] == BASE_API_CALLS
def test_activities_dev_mode(mocker, mock_user_api, mock_worker_version_api): def test_activities_dev_mode(mocker, mock_worker_version_api):
""" """
Worker activities are not stored in dev mode Worker activities are not stored in dev mode
""" """
......
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