Skip to content
Snippets Groups Projects
Commit 8874eafa authored by NolanB's avatar NolanB
Browse files

Fix lintin

parent a47eb527
No related branches found
No related tags found
1 merge request!209Remove ARKINDEX_CORPUS_ID usage
Pipeline #79540 failed
...@@ -40,9 +40,6 @@ class EntityMixin(object): ...@@ -40,9 +40,6 @@ class EntityMixin(object):
:type element: Element or CachedElement :type element: Element or CachedElement
:param name str: Name of the entity. :param name str: Name of the entity.
:param type EntityType: Type of the entity. :param type EntityType: Type of the entity.
:param corpus: UUID of the corpus to create an entity on, or None to use the
value of the ``ARKINDEX_CORPUS_ID`` environment variable.
:type corpus: str or None
""" """
assert element and isinstance( assert element and isinstance(
element, (Element, CachedElement) element, (Element, CachedElement)
......
...@@ -36,7 +36,10 @@ def test_get_ml_class_id_load_classes(responses, mock_elements_worker): ...@@ -36,7 +36,10 @@ def test_get_ml_class_id_load_classes(responses, mock_elements_worker):
assert [ assert [
(call.request.method, call.request.url) for call in responses.calls (call.request.method, call.request.url) for call in responses.calls
] == BASE_API_CALLS + [ ] == BASE_API_CALLS + [
("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), (
"GET",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
),
] ]
assert mock_elements_worker.classes == { assert mock_elements_worker.classes == {
"12341234-1234-1234-1234-123412341234": {"good": "0000"} "12341234-1234-1234-1234-123412341234": {"good": "0000"}
...@@ -46,9 +49,9 @@ def test_get_ml_class_id_load_classes(responses, mock_elements_worker): ...@@ -46,9 +49,9 @@ def test_get_ml_class_id_load_classes(responses, mock_elements_worker):
def test_get_ml_class_id_inexistant_class(mock_elements_worker, responses): def test_get_ml_class_id_inexistant_class(mock_elements_worker, responses):
# A missing class is now created automatically # A missing class is now created automatically
mock_elements_worker.corpus_id = "12341234-1234-1234-1234-123412341234" mock_elements_worker.corpus_id = "12341234-1234-1234-1234-123412341234"
mock_elements_worker.classes = { mock_elements_worker.classes = {
"12341234-1234-1234-1234-123412341234": {"good": "0000"} "12341234-1234-1234-1234-123412341234": {"good": "0000"}
} }
responses.add( responses.add(
...@@ -145,9 +148,18 @@ def test_get_ml_class_reload(responses, mock_elements_worker): ...@@ -145,9 +148,18 @@ def test_get_ml_class_reload(responses, mock_elements_worker):
assert [ assert [
(call.request.method, call.request.url) for call in responses.calls (call.request.method, call.request.url) for call in responses.calls
] == BASE_API_CALLS + [ ] == BASE_API_CALLS + [
("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), (
("POST", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), "GET",
("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
),
(
"POST",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
),
(
"GET",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
),
] ]
......
...@@ -289,11 +289,26 @@ def test_load_corpus_classes_api_error(responses, mock_elements_worker): ...@@ -289,11 +289,26 @@ def test_load_corpus_classes_api_error(responses, mock_elements_worker):
(call.request.method, call.request.url) for call in responses.calls (call.request.method, call.request.url) for call in responses.calls
] == BASE_API_CALLS + [ ] == BASE_API_CALLS + [
# We do 5 retries # We do 5 retries
("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), (
("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), "GET",
("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), ),
("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), (
"GET",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
),
(
"GET",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
),
(
"GET",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
),
(
"GET",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
),
] ]
assert not mock_elements_worker.classes assert not mock_elements_worker.classes
...@@ -331,7 +346,10 @@ def test_load_corpus_classes(responses, mock_elements_worker): ...@@ -331,7 +346,10 @@ def test_load_corpus_classes(responses, mock_elements_worker):
assert [ assert [
(call.request.method, call.request.url) for call in responses.calls (call.request.method, call.request.url) for call in responses.calls
] == BASE_API_CALLS + [ ] == BASE_API_CALLS + [
("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), (
"GET",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
),
] ]
assert mock_elements_worker.classes == { assert mock_elements_worker.classes == {
"12341234-1234-1234-1234-123412341234": { "12341234-1234-1234-1234-123412341234": {
......
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