Skip to content

Commit

Permalink
refactor:use different db
Browse files Browse the repository at this point in the history
  • Loading branch information
cunla committed Dec 3, 2023
1 parent a1a5bb8 commit 2819398
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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()
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions test/test_hypothesis.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions test/test_init_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion test/test_mixins/test_server_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions test/test_scripting_lua_only.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 2819398

Please sign in to comment.