diff --git a/.github/actions/regression-tests/action.yml b/.github/actions/regression-tests/action.yml index 888201b10415..555716b1a7a4 100644 --- a/.github/actions/regression-tests/action.yml +++ b/.github/actions/regression-tests/action.yml @@ -41,6 +41,8 @@ runs: # timeout returns 124 if we exceeded the timeout duration if [[ $code -eq 124 ]]; then + # Add an extra new line here because when tests timeout the first line below continues from the test failure name + echo "\n" echo "🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑" echo "🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 TESTS TIMEDOUT 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑" echo "🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑 🛑" diff --git a/tests/dragonfly/pymemcached_test.py b/tests/dragonfly/pymemcached_test.py index 7a0fd9b86f65..efd53767049b 100644 --- a/tests/dragonfly/pymemcached_test.py +++ b/tests/dragonfly/pymemcached_test.py @@ -47,7 +47,6 @@ def test_basic(memcached_client: MCClient): # Noreply (and pipeline) tests -@pytest.mark.dbg_only @dfly_args(DEFAULT_ARGS) def test_noreply_pipeline(df_server: DflyInstance, memcached_client: MCClient): """ diff --git a/tests/dragonfly/snapshot_test.py b/tests/dragonfly/snapshot_test.py index b96407e3437d..46e6a1ad35e2 100644 --- a/tests/dragonfly/snapshot_test.py +++ b/tests/dragonfly/snapshot_test.py @@ -3,7 +3,7 @@ import os import glob import asyncio -import async_timeout +from async_timeout import timeout import redis from redis import asyncio as aioredis from pathlib import Path @@ -169,7 +169,7 @@ async def test_cron_snapshot(tmp_dir: Path, async_client: aioredis.Redis): await StaticSeeder(**LIGHTWEIGHT_SEEDER_ARGS).run(async_client) file = None - with async_timeout.timeout(65): + async with timeout(65): while file is None: await asyncio.sleep(1) file = find_main_file(tmp_dir, "test-cron-summary.dfs") @@ -185,7 +185,7 @@ async def test_set_cron_snapshot(tmp_dir: Path, async_client: aioredis.Redis): await async_client.config_set("snapshot_cron", "* * * * *") file = None - with async_timeout.timeout(65): + async with timeout(65): while file is None: await asyncio.sleep(1) file = find_main_file(tmp_dir, "test-cron-set-summary.dfs")