summaryrefslogtreecommitdiff
path: root/pymemcache/test/conftest.py
diff options
context:
space:
mode:
authorJoe Gordon <jogo@users.noreply.github.com>2022-10-17 09:39:40 -0700
committerGitHub <noreply@github.com>2022-10-17 09:39:40 -0700
commit337fcf8824e2c2131537bedd88621052d2451153 (patch)
tree7e7a7f45986174a1cea6ed1e17305f3dd5f944f3 /pymemcache/test/conftest.py
parent8613abb75fd0a3bab73bf2dd97ccc823d70d67bf (diff)
parent3dafd6702f490ea5daf0ff244802b17e1da86a65 (diff)
downloadpymemcache-337fcf8824e2c2131537bedd88621052d2451153.tar.gz
Merge pull request #433 from jogo/prefix
Fix key_prefix issue with stats and cache_memlimit
Diffstat (limited to 'pymemcache/test/conftest.py')
-rw-r--r--pymemcache/test/conftest.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/pymemcache/test/conftest.py b/pymemcache/test/conftest.py
index e8b8bdf..ce532e9 100644
--- a/pymemcache/test/conftest.py
+++ b/pymemcache/test/conftest.py
@@ -1,8 +1,9 @@
import os.path
-import pytest
import socket
import ssl
+import pytest
+
def pytest_addoption(parser):
parser.addoption(
@@ -100,7 +101,7 @@ def pytest_generate_tests(metafunc):
metafunc.parametrize("socket_module", socket_modules)
if "client_class" in metafunc.fixturenames:
- from pymemcache.client.base import PooledClient, Client
+ from pymemcache.client.base import Client, PooledClient
from pymemcache.client.hash import HashClient
class HashClientSingle(HashClient):
@@ -108,3 +109,8 @@ def pytest_generate_tests(metafunc):
super().__init__([server], *args, **kwargs)
metafunc.parametrize("client_class", [Client, PooledClient, HashClientSingle])
+
+ if "key_prefix" in metafunc.fixturenames:
+ mark = metafunc.definition.get_closest_marker("parametrize")
+ if not mark or "key_prefix" not in mark.args[0]:
+ metafunc.parametrize("key_prefix", [b"", b"prefix"])