|
1 | 1 | import random |
2 | 2 | import time |
3 | | -from distutils.version import LooseVersion |
4 | 3 | from unittest.mock import Mock |
5 | 4 | from urllib.parse import urlparse |
6 | 5 |
|
7 | 6 | import pytest |
| 7 | +from packaging.version import Version |
8 | 8 |
|
9 | 9 | import redis |
10 | 10 | from redis.backoff import NoBackoff |
@@ -117,13 +117,13 @@ def wait_for_cluster_creation(redis_url, cluster_nodes, timeout=20): |
117 | 117 |
|
118 | 118 | def skip_if_server_version_lt(min_version): |
119 | 119 | redis_version = REDIS_INFO["version"] |
120 | | - check = LooseVersion(redis_version) < LooseVersion(min_version) |
| 120 | + check = Version(redis_version) < Version(min_version) |
121 | 121 | return pytest.mark.skipif(check, reason=f"Redis version required >= {min_version}") |
122 | 122 |
|
123 | 123 |
|
124 | 124 | def skip_if_server_version_gte(min_version): |
125 | 125 | redis_version = REDIS_INFO["version"] |
126 | | - check = LooseVersion(redis_version) >= LooseVersion(min_version) |
| 126 | + check = Version(redis_version) >= Version(min_version) |
127 | 127 | return pytest.mark.skipif(check, reason=f"Redis version required < {min_version}") |
128 | 128 |
|
129 | 129 |
|
@@ -331,7 +331,7 @@ def wait_for_command(client, monitor, command, key=None): |
331 | 331 | if key is None: |
332 | 332 | # generate key |
333 | 333 | redis_version = REDIS_INFO["version"] |
334 | | - if LooseVersion(redis_version) >= LooseVersion("5.0.0"): |
| 334 | + if Version(redis_version) >= Version("5.0.0"): |
335 | 335 | id_str = str(client.client_id()) |
336 | 336 | else: |
337 | 337 | id_str = f"{random.randrange(2 ** 32):08x}" |
|
0 commit comments