From 65b2e5df86caf0f6362b819c95356d02ce29c6da Mon Sep 17 00:00:00 2001
From: Yoann Schneider <yschneider@teklia.com>
Date: Tue, 30 Aug 2022 17:39:47 +0200
Subject: [PATCH] fix typo, remove any useless code from tests and use
setup_api_client instead of configure
---
arkindex_worker/worker/element.py | 4 ++--
tests/test_elements_worker/test_elements.py | 16 ++++------------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/arkindex_worker/worker/element.py b/arkindex_worker/worker/element.py
index 0f3648c0..95092ee8 100644
--- a/arkindex_worker/worker/element.py
+++ b/arkindex_worker/worker/element.py
@@ -12,7 +12,7 @@ from arkindex_worker import logger
from arkindex_worker.cache import CachedElement, CachedImage
from arkindex_worker.models import Corpus, Element
-ElementType = NamedTuple("ElemenType", name=str, slug=str, is_folder=bool)
+ElementType = NamedTuple("ElementType", name=str, slug=str, is_folder=bool)
class MissingTypeError(Exception):
@@ -78,7 +78,7 @@ class ElementMixin(object):
)
else:
raise MissingTypeError(
- f'Element type(s) {", ".join(sorted(missing_slugs))} were not found in the {corpus["name"]} corpus ({corpus["id"]}).'
+ f'Element type(s) {", ".join(sorted(missing_slugs))} were not found in the {corpus.name} corpus ({corpus.id}).'
)
return True
diff --git a/tests/test_elements_worker/test_elements.py b/tests/test_elements_worker/test_elements.py
index d3cb20cf..c74aa273 100644
--- a/tests/test_elements_worker/test_elements.py
+++ b/tests/test_elements_worker/test_elements.py
@@ -34,11 +34,7 @@ def test_check_required_types_argument_types(mock_elements_worker):
assert str(e.value) == "Element type slugs must be strings."
-def test_check_required_types(monkeypatch, tmp_path, mock_elements_worker, responses):
- elements_path = tmp_path / "elements.json"
- elements_path.write_text("[]")
- monkeypatch.setenv("TASK_ELEMENTS", str(elements_path))
-
+def test_check_required_types(responses):
corpus_id = "12341234-1234-1234-1234-123412341234"
responses.add(
responses.GET,
@@ -50,7 +46,7 @@ def test_check_required_types(monkeypatch, tmp_path, mock_elements_worker, respo
},
)
worker = ElementsWorker()
- worker.configure()
+ worker.setup_api_client()
assert worker.check_required_types(corpus_id, "page")
assert worker.check_required_types(corpus_id, "page", "folder")
@@ -63,11 +59,7 @@ def test_check_required_types(monkeypatch, tmp_path, mock_elements_worker, respo
)
-def test_create_missing_types(monkeypatch, tmp_path, mock_elements_worker, responses):
- elements_path = tmp_path / "elements.json"
- elements_path.write_text("[]")
- monkeypatch.setenv("TASK_ELEMENTS", str(elements_path))
-
+def test_create_missing_types(responses):
corpus_id = "12341234-1234-1234-1234-123412341234"
responses.add(
@@ -108,7 +100,7 @@ def test_create_missing_types(monkeypatch, tmp_path, mock_elements_worker, respo
],
)
worker = ElementsWorker()
- worker.configure()
+ worker.setup_api_client()
assert worker.check_required_types(
corpus_id, "page", "text_line", "act", create_missing=True
--
GitLab