mirror of
https://github.com/dragonflydb/dragonfly.git
synced 2025-05-10 18:05:44 +02:00
chore: clean up of deprecated flags (#4545)
Also fix sentinel test by using a precise redis-server version. Finally, add pytest warnings filter to reduce noise Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
parent
9d303f8abe
commit
8c937ebf37
10 changed files with 32 additions and 73 deletions
|
@ -480,8 +480,10 @@ class RedisServer:
|
|||
self.port = port
|
||||
self.proc = None
|
||||
|
||||
def start(self, **kwargs):
|
||||
servers = ["redis-server-6.2.11", "redis-server-7.2.2", "valkey-server-8.0.1"]
|
||||
def start(self, redis7=None, **kwargs):
|
||||
servers = ["redis-server-7.2.2"]
|
||||
if not redis7:
|
||||
servers += ["redis-server-6.2.11", "valkey-server-8.0.1"]
|
||||
command = [
|
||||
random.choice(servers),
|
||||
f"--port {self.port}",
|
||||
|
|
|
@ -81,7 +81,7 @@ class Sentinel:
|
|||
logging.info(self.config_file.read_text())
|
||||
|
||||
self.proc = subprocess.Popen(
|
||||
["redis-server", f"{self.config_file.absolute()}", "--sentinel"]
|
||||
["redis-server-6.2.11", f"{self.config_file.absolute()}", "--sentinel"]
|
||||
)
|
||||
|
||||
def stop(self):
|
||||
|
|
|
@ -154,8 +154,7 @@ async def test_dbfilenames(
|
|||
{
|
||||
**BASIC_ARGS,
|
||||
"proactor_threads": 4,
|
||||
"dbfilename": "test-redis-load-rdb",
|
||||
"list_rdb_encode_v2": "false", # Needed for compatibility with Redis 6
|
||||
"dbfilename": "test-redis-load-rdb",
|
||||
}
|
||||
)
|
||||
async def test_redis_load_snapshot(
|
||||
|
@ -176,7 +175,7 @@ async def test_redis_load_snapshot(
|
|||
await async_client.connection_pool.disconnect()
|
||||
df_server.stop()
|
||||
|
||||
redis_local_server.start(dir=tmp_dir, dbfilename="test-redis-load-rdb.rdb")
|
||||
redis_local_server.start(dir=tmp_dir, redis7=True, dbfilename="test-redis-load-rdb.rdb")
|
||||
await asyncio.sleep(1)
|
||||
c_master = aioredis.Redis(port=redis_local_server.port)
|
||||
await c_master.ping()
|
||||
|
|
|
@ -10,3 +10,5 @@ markers =
|
|||
slow: marks tests as slow (deselect with '-m "not slow"')
|
||||
opt_only: marks tests that are only reasonable to run against an opt-built Dragonfly
|
||||
exclude_epoll: marks tests that should not run on epoll socket
|
||||
filterwarnings =
|
||||
ignore::DeprecationWarning
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue