From 2819398ec9a5af469abb5aea6a6ccdef96e640d2 Mon Sep 17 00:00:00 2001 From: Daniel M Date: Sat, 2 Dec 2023 20:16:57 -0500 Subject: [PATCH] refactor:use different db --- test/conftest.py | 6 +++--- test/test_hypothesis.py | 4 ++-- test/test_init_args.py | 4 ++-- test/test_mixins/test_server_commands.py | 2 +- test/test_scripting_lua_only.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 93d73bc6..ddd49d24 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -13,7 +13,7 @@ def real_redis_version() -> Union[None, str]: """Returns server's version or None if server is not running""" client = None try: - client = redis.StrictRedis('localhost', port=6379) + client = redis.StrictRedis('localhost', port=6379, db=2) server_version = client.info()['redis_version'] return server_version except redis.ConnectionError: @@ -34,7 +34,7 @@ def _fake_server(request): @pytest_asyncio.fixture def r(request, create_redis) -> redis.Redis: - rconn = create_redis(db=0) + rconn = create_redis(db=2) connected = request.node.get_closest_marker('disconnected') is None if connected: rconn.flushall() @@ -73,7 +73,7 @@ def _create_redis(request) -> Callable[[int], redis.Redis]: pytest.skip(f'Redis server {max_server} or less required but {server_version} found') decode_responses = request.node.get_closest_marker('decode_responses') is not None - def factory(db=0): + def factory(db=2): if cls_name.startswith('Fake'): fake_server = request.getfixturevalue('fake_server') cls = getattr(fakeredis, cls_name) diff --git a/test/test_hypothesis.py b/test/test_hypothesis.py index 8fa51688..1cc18dce 100644 --- a/test/test_hypothesis.py +++ b/test/test_hypothesis.py @@ -20,7 +20,7 @@ def get_redis_version() -> Tuple[int]: try: - r = redis.StrictRedis('localhost', port=6379) + r = redis.StrictRedis('localhost', port=6379, db=2) r.ping() return _create_version(r.info()['redis_version']) except redis.ConnectionError: @@ -259,7 +259,7 @@ class CommonMachine(hypothesis.stateful.RuleBasedStateMachine): def __init__(self): super().__init__() try: - self.real = redis.StrictRedis('localhost', port=6379) + self.real = redis.StrictRedis('localhost', port=6379, db=2) self.real.ping() except redis.ConnectionError: pytest.skip('redis is not running') diff --git a/test/test_init_args.py b/test/test_init_args.py index f11c87c8..c83963be 100644 --- a/test/test_init_args.py +++ b/test/test_init_args.py @@ -4,8 +4,8 @@ def test_multidb(create_redis): - r1 = create_redis(db=0) - r2 = create_redis(db=1) + r1 = create_redis(db=2) + r2 = create_redis(db=3) r1['r1'] = 'r1' r2['r2'] = 'r2' diff --git a/test/test_mixins/test_server_commands.py b/test/test_mixins/test_server_commands.py index 5133bcc8..01d65910 100644 --- a/test/test_mixins/test_server_commands.py +++ b/test/test_mixins/test_server_commands.py @@ -10,7 +10,7 @@ def test_swapdb(r, create_redis): - r1 = create_redis(1) + r1 = create_redis(2) r.set('foo', 'abc') r.set('bar', 'xyz') r1.set('foo', 'foo') diff --git a/test/test_scripting_lua_only.py b/test/test_scripting_lua_only.py index 47b4cf72..32897504 100644 --- a/test/test_scripting_lua_only.py +++ b/test/test_scripting_lua_only.py @@ -320,8 +320,8 @@ def test_eval_flushdb(r: redis.Redis): def test_eval_flushall(r, create_redis): - r1 = create_redis(db=0) - r2 = create_redis(db=1) + r1 = create_redis(db=2) + r2 = create_redis(db=3) r1['r1'] = 'r1' r2['r2'] = 'r2'