From 5ae2a788e81b7d522bfbad84e16105f5d6c98efd Mon Sep 17 00:00:00 2001
From: NolanB <nboukachab@teklia.com>
Date: Mon, 5 Sep 2022 15:04:17 +0200
Subject: [PATCH] Fix lintin

---
 tests/test_elements_worker/test_classifications.py | 2 +-
 tests/test_elements_worker/test_elements.py        | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/test_elements_worker/test_classifications.py b/tests/test_elements_worker/test_classifications.py
index 2ca10bee..d50f6fab 100644
--- a/tests/test_elements_worker/test_classifications.py
+++ b/tests/test_elements_worker/test_classifications.py
@@ -51,7 +51,7 @@ def test_get_ml_class_id_inexistant_class(mock_elements_worker, responses):
     # A missing class is now created automatically
     corpus_id = "11111111-1111-1111-1111-111111111111"
     mock_elements_worker.classes = {
-         "12341234-1234-1234-1234-123412341234": {"good": "0000"}
+        "12341234-1234-1234-1234-123412341234": {"good": "0000"}
     }
 
     responses.add(
diff --git a/tests/test_elements_worker/test_elements.py b/tests/test_elements_worker/test_elements.py
index 362e9112..ea3ed645 100644
--- a/tests/test_elements_worker/test_elements.py
+++ b/tests/test_elements_worker/test_elements.py
@@ -289,7 +289,7 @@ def test_load_corpus_classes_api_error(responses, mock_elements_worker):
     ] == BASE_API_CALLS + [
         # We do 5 retries
         (
-            "GET",
+            "GET", 
             "http://testserver/api/v1/corpus/11111111-1111-1111-1111-111111111111/classes/",
         ),
         (
@@ -344,14 +344,10 @@ def test_load_corpus_classes(responses, mock_elements_worker):
     assert [
         (call.request.method, call.request.url) for call in responses.calls
     ] == BASE_API_CALLS + [
-<<<<<<< HEAD
         (
             "GET",
             "http://testserver/api/v1/corpus/11111111-1111-1111-1111-111111111111/classes/",
         ),
-=======
-        ("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"),
->>>>>>> a47eb52... Modif with the review
     ]
     assert mock_elements_worker.classes == {
         "12341234-1234-1234-1234-123412341234": {
-- 
GitLab