tests fix

deker_server_adapters/consts.py

@@ -22,6 +22,7 @@
 EXCEPTION_CLASS_PARAM_NAME = "class"
 LAST_MODIFIED_HEADER = "last-modified"
 REBALANCING_STATUS = "rebalancing"
+NORMAL_STATUS = "normal"
 
 
 class ArrayType(Enum):

deker_server_adapters/hash_ring.py

@@ -73,7 +73,8 @@ def get_node(self, string_key: str) -> T:  # type: ignore[type-var]
         """
         pos = self.get_node_pos(string_key)
         if pos is None:
-            raise HashRingError(f"Couldn't find a position in {self.ring}")
+            msg = f"Couldn't find a position in {self.ring}"
+            raise HashRingError(msg)
         return self.ring[self._sorted_keys[pos]]
 
     def get_node_pos(self, string_key: str) -> Optional[int]:

tests/conftest.py

@@ -18,7 +18,7 @@
 from deker_server_adapters.array_adapter import ServerArrayAdapter
 from deker_server_adapters.cluster_config import apply_config
 from deker_server_adapters.collection_adapter import ServerCollectionAdapter
-from deker_server_adapters.consts import LAST_MODIFIED_HEADER
+from deker_server_adapters.consts import LAST_MODIFIED_HEADER, NORMAL_STATUS, REBALANCING_STATUS
 from deker_server_adapters.factory import AdaptersFactory
 from deker_server_adapters.hash_ring import HashRing
 from deker_server_adapters.httpx_client import HttpxClient
@@ -38,6 +38,11 @@ def mode(request) -> str:
     return request.param
 
 
+@pytest.fixture(params=[REBALANCING_STATUS, NORMAL_STATUS])
+def status(request) -> str:
+    return request.param
+
+
 @pytest.fixture()
 def base_uri(mode, base_cluster_uri):
     if mode == SINGLE_MODE:
@@ -236,6 +241,6 @@ def array_url_path(array: Array) -> str:
 
 
 @pytest.fixture()
-def mock_status(mode: str, request: pytest.FixtureRequest):
-    if mode == CLUSTER_MODE:
+def mock_status(mode: str, request: pytest.FixtureRequest, status: str):
+    if mode == CLUSTER_MODE and status == REBALANCING_STATUS:
         request.getfixturevalue("mocked_filestatus_check_unmoved")

tests/plugins/cluster.py

@@ -7,6 +7,7 @@
 from deker.uri import Uri
 from pytest_httpx import HTTPXMock
 
+from deker_server_adapters.consts import REBALANCING_STATUS
 from deker_server_adapters.models import Status
 
 
@@ -18,14 +19,14 @@ def nodes() -> List[Dict]:
             "host": "localhost",
             "port": 8000,
             "protocol": "http",
-            "storage": "file:///tmp/deker_server"
+            "storage": "file:///tmp/deker_server",
         },
         {
             "id": "8381202B-8C95-487A-B9B5-0B5270568040",
             "host": "localhost",
             "port": 8012,
             "protocol": "http",
-            "storage": "file:///tmp/deker_server"
+            "storage": "file:///tmp/deker_server",
         },
     ]
 
@@ -48,13 +49,14 @@ def base_cluster_uri(nodes_urls):
 
 
 @pytest.fixture()
-def mocked_ping(nodes: List[Dict]) -> Dict:
+def mocked_ping(nodes: List[Dict], status: str) -> Dict:
     return {
         "mode": "cluster",
+        "cluster_status": status,
         "this_id": "8381202B-8C95-487A-B9B5-0B527056804E",
         "leader_id": "8381202B-8C95-487A-B9B5-0B527056804E",
         "current": nodes,
-        "raft": nodes
+        "raft": nodes,
     }
 
 
@@ -64,5 +66,6 @@ def mock_healthcheck(httpx_mock: HTTPXMock, mocked_ping):
 
 
 @pytest.fixture()
-def mocked_filestatus_check_unmoved(httpx_mock: HTTPXMock):
-    httpx_mock.add_response(method="GET", url=re.compile(r".*\/status.*"), text=Status.UNMOVED.value)
+def mocked_filestatus_check_unmoved(httpx_mock: HTTPXMock, status: str):
+    if status == REBALANCING_STATUS:
+        httpx_mock.add_response(method="GET", url=re.compile(r".*\/status.*"), text=Status.UNMOVED.value)

tests/test_cases/test_cluster/test_array_adapter.py

@@ -2,7 +2,6 @@
 import re
 
 from typing import TYPE_CHECKING, List
-from unittest.mock import patch
 
 import httpx
 import numpy as np
@@ -15,6 +14,7 @@
 from deker_server_adapters.array_adapter import ServerArrayAdapter
 from deker_server_adapters.consts import LAST_MODIFIED_HEADER
 from deker_server_adapters.errors import FilteringByIdInClusterIsForbidden
+from deker_server_adapters.models import Status
 from deker_server_adapters.utils.hashing import get_hash_key
 
 
@@ -78,7 +78,7 @@ def test_filter_by_id_is_not_allowed(collection_with_primary_attributes):
         collection_with_primary_attributes.filter({"id": "foo"}).last()
 
 
-def test_hash_updated(httpx_mock: HTTPXMock, server_array_adapter: ServerArrayAdapter, mocked_ping, array):
+def test_hash_updated(httpx_mock: HTTPXMock, server_array_adapter: ServerArrayAdapter, mocked_ping, array, status: str):
     class RequestCounter:
         def __init__(self):
             self.count = 0
@@ -96,6 +96,9 @@ def limited_mock_response(request, extensions, request_counter, mocked_ping, dat
             else:
                 return httpx.Response(200, json=data)
 
+        elif "status" in str(request.url):
+            return httpx.Response(text=Status.UNMOVED.value, status_code=200)
+
         return httpx.Response(404, json={"error": "Not found"})
 
     httpx_mock.add_callback(

tests/test_cases/test_cluster/test_varray_adapters.py

@@ -14,6 +14,7 @@
 from deker_server_adapters.array_adapter import ServerArrayAdapter
 from deker_server_adapters.consts import LAST_MODIFIED_HEADER
 from deker_server_adapters.errors import FilteringByIdInClusterIsForbidden
+from deker_server_adapters.models import Status
 from deker_server_adapters.utils.hashing import get_hash_key
 from deker_server_adapters.varray_adapter import ServerVarrayAdapter
 
@@ -102,6 +103,9 @@ def limited_mock_response(request, extensions, request_counter, mocked_ping, dat
             else:
                 return httpx.Response(200, json=data)
 
+        elif "status" in str(request.url):
+            return httpx.Response(text=Status.UNMOVED.value)
+
         return httpx.Response(404, json={"error": "Not found"})
 
     httpx_mock.add_callback(