summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorAndy McCurdy <andy@andymccurdy.com>2014-03-29 10:57:21 -0700
committerAndy McCurdy <andy@andymccurdy.com>2014-03-29 10:57:21 -0700
commit018e1324699832d6c3ed819a26968d318929464c (patch)
tree3c79e502651cc5158983f02f74740065eb8b0092 /tests/conftest.py
parent169cc0241a4f8824f35add9a872c067b70b1e95c (diff)
downloadredis-py-018e1324699832d6c3ed819a26968d318929464c.tar.gz
make sure we know the order of expected subscribe/unsubscribe messages
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 553838d..bd0116b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,8 @@
import pytest
import redis
+from distutils.version import StrictVersion
+
_REDIS_VERSIONS = {}
@@ -30,9 +32,8 @@ def _get_client(cls, request=None, **kwargs):
def skip_if_server_version_lt(min_version):
- version = get_version()
- c = "StrictVersion('%s') < StrictVersion('%s')" % (version, min_version)
- return pytest.mark.skipif(c)
+ check = StrictVersion(get_version()) < StrictVersion(min_version)
+ return pytest.mark.skipif(check, reason="")
@pytest.fixture()