summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChayim <chayim@users.noreply.github.com>2021-12-08 13:04:51 +0200
committerGitHub <noreply@github.com>2021-12-08 13:04:51 +0200
commitbba31cde198fa16520eaf3cc272b403d13e00fdc (patch)
treeec0ef079c0f609af3dea0df42c5388b5f4550c16
parent748c8d1029f018e752b4039253dcb8de2fc57a34 (diff)
downloadredis-py-bba31cde198fa16520eaf3cc272b403d13e00fdc.tar.gz
Removing distutils from tests (#1773)
Co-authored-by: Bar Shaul <88437685+barshaul@users.noreply.github.com>
-rw-r--r--tests/conftest.py8
-rw-r--r--tests/test_search.py4
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index ab29ee4..4b5f6cb 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,10 +1,10 @@
import random
import time
-from distutils.version import LooseVersion
from unittest.mock import Mock
from urllib.parse import urlparse
import pytest
+from packaging.version import Version
import redis
from redis.backoff import NoBackoff
@@ -117,13 +117,13 @@ def wait_for_cluster_creation(redis_url, cluster_nodes, timeout=20):
def skip_if_server_version_lt(min_version):
redis_version = REDIS_INFO["version"]
- check = LooseVersion(redis_version) < LooseVersion(min_version)
+ check = Version(redis_version) < Version(min_version)
return pytest.mark.skipif(check, reason=f"Redis version required >= {min_version}")
def skip_if_server_version_gte(min_version):
redis_version = REDIS_INFO["version"]
- check = LooseVersion(redis_version) >= LooseVersion(min_version)
+ check = Version(redis_version) >= Version(min_version)
return pytest.mark.skipif(check, reason=f"Redis version required < {min_version}")
@@ -331,7 +331,7 @@ def wait_for_command(client, monitor, command, key=None):
if key is None:
# generate key
redis_version = REDIS_INFO["version"]
- if LooseVersion(redis_version) >= LooseVersion("5.0.0"):
+ if Version(redis_version) >= Version("5.0.0"):
id_str = str(client.client_id())
else:
id_str = f"{random.randrange(2 ** 32):08x}"
diff --git a/tests/test_search.py b/tests/test_search.py
index 1a22b66..7d666cb 100644
--- a/tests/test_search.py
+++ b/tests/test_search.py
@@ -1419,7 +1419,7 @@ def test_profile(client):
assert det["Iterators profile"]["Counter"] == 2.0
assert len(det["Iterators profile"]["Child iterators"]) == 2
assert det["Iterators profile"]["Type"] == "UNION"
- assert det["Parsing time"] < 0.3
+ assert det["Parsing time"] < 0.5
assert len(res.docs) == 2 # check also the search result
# check using AggregateRequest
@@ -1431,7 +1431,7 @@ def test_profile(client):
res, det = client.ft().profile(req)
assert det["Iterators profile"]["Counter"] == 2.0
assert det["Iterators profile"]["Type"] == "WILDCARD"
- assert det["Parsing time"] < 0.3
+ assert det["Parsing time"] < 0.5
assert len(res.rows) == 2 # check also the search result