From 151b83bd5fa0bd2f3b8bc80e478228c7b8e56126 Mon Sep 17 00:00:00 2001 From: Vladislav Oleshko Date: Sun, 5 Mar 2023 12:44:17 +0300 Subject: [PATCH 1/3] fix(pytest): Add master restart delay Signed-off-by: Vladislav Oleshko --- tests/dragonfly/replication_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/dragonfly/replication_test.py b/tests/dragonfly/replication_test.py index ea5970b122fe..5ceec50377fe 100644 --- a/tests/dragonfly/replication_test.py +++ b/tests/dragonfly/replication_test.py @@ -297,6 +297,7 @@ async def crash_master_fs(): master.stop(kill=True) async def start_master(): + await asyncio.sleep(0.2) master.start() c_master = aioredis.Redis(port=master.port) assert await c_master.ping() From dce00b10472fed0216dc7ec20bc9d72c8af56d71 Mon Sep 17 00:00:00 2001 From: Vladislav Oleshko Date: Sun, 5 Mar 2023 13:41:51 +0300 Subject: [PATCH 2/3] fix(pytest): Re-check process status after failed grace shutdown Signed-off-by: Vladislav Oleshko --- tests/dragonfly/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/dragonfly/__init__.py b/tests/dragonfly/__init__.py index 0f53366f637e..e50a987c2522 100644 --- a/tests/dragonfly/__init__.py +++ b/tests/dragonfly/__init__.py @@ -52,6 +52,7 @@ def stop(self, kill=False): except subprocess.TimeoutExpired: print("Unable to terminate DragonflyDB gracefully, it was killed") proc.kill() + proc.communicate() def _start(self): base_args = [f"--{v}" for v in self.params.args] From c1df0fd05d87f25162f321e9ccb5ad127dbaf456 Mon Sep 17 00:00:00 2001 From: Vladislav Oleshko Date: Sun, 5 Mar 2023 15:36:05 +0300 Subject: [PATCH 3/3] chore(pytest): Increase regression test timeout to 45 min Signed-off-by: Vladislav Oleshko --- .github/workflows/regression-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml index 65072d5ca91a..43dcba96e3b3 100644 --- a/.github/workflows/regression-tests.yml +++ b/.github/workflows/regression-tests.yml @@ -16,7 +16,7 @@ jobs: # Test of these containers container: ["ubuntu-dev:20"] build-type: [Debug, Release] - timeout-minutes: 30 + timeout-minutes: 45 container: image: ghcr.io/romange/${{ matrix.container }}