Skip to content

Commit 5a9a94b

Browse files
authored
Revert "test: unskip epoll cluster and replication tests (#5757)" (#5761)
This reverts commit 5b496fc.
1 parent a1e01d7 commit 5a9a94b

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

tests/dragonfly/cluster_test.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,6 +1471,7 @@ async def test_migration_with_key_ttl(df_factory):
14711471
assert await nodes[1].client.execute_command("stick k_sticky") == 0
14721472

14731473

1474+
@pytest.mark.exclude_epoll
14741475
@dfly_args({"proactor_threads": 4, "cluster_mode": "yes", "migration_finalization_timeout_ms": 5})
14751476
async def test_network_disconnect_during_migration(df_factory):
14761477
instances = [
@@ -2028,6 +2029,7 @@ async def start_save():
20282029
# We can try to use FakeRedis with the DebugPopulateSeeder comparison here.
20292030

20302031

2032+
@pytest.mark.exclude_epoll
20312033
@dfly_args({"proactor_threads": 4, "cluster_mode": "yes"})
20322034
@pytest.mark.asyncio
20332035
async def test_cluster_migration_cancel(df_factory: DflyInstanceFactory):
@@ -2093,6 +2095,7 @@ async def node1size0():
20932095
@dfly_args({"proactor_threads": 2, "cluster_mode": "yes"})
20942096
@pytest.mark.asyncio
20952097
@pytest.mark.opt_only
2098+
@pytest.mark.exclude_epoll
20962099
async def test_cluster_migration_huge_container(df_factory: DflyInstanceFactory):
20972100
instances = [
20982101
df_factory.create(port=next(next_port), admin_port=next(next_port)) for i in range(2)
@@ -2154,6 +2157,7 @@ async def test_cluster_migration_huge_container(df_factory: DflyInstanceFactory)
21542157
)
21552158
@pytest.mark.parametrize("chunk_size", [1_000_000, 30])
21562159
@pytest.mark.asyncio
2160+
@pytest.mark.exclude_epoll
21572161
async def test_cluster_migration_while_seeding(
21582162
df_factory: DflyInstanceFactory, df_seeder_factory: DflySeederFactory, chunk_size
21592163
):
@@ -2301,6 +2305,7 @@ async def await_no_lag(client: aioredis.Redis, timeout=10):
23012305
raise RuntimeError("Lag did not reduced to 0!")
23022306

23032307

2308+
@pytest.mark.exclude_epoll
23042309
@dfly_args({"proactor_threads": 4})
23052310
async def test_replicate_cluster(df_factory: DflyInstanceFactory, df_seeder_factory):
23062311
"""
@@ -2510,6 +2515,7 @@ async def await_eq_offset(client: aioredis.Redis, timeout=20):
25102515
raise RuntimeError("offset not equal!")
25112516

25122517

2518+
@pytest.mark.exclude_epoll
25132519
@dfly_args({"proactor_threads": 4})
25142520
async def test_replicate_redis_cluster(redis_cluster, df_factory, df_seeder_factory):
25152521
"""
@@ -2715,6 +2721,7 @@ async def test_cluster_memory_consumption_migration(df_factory: DflyInstanceFact
27152721
await check_for_no_state_status([node.admin_client for node in nodes])
27162722

27172723

2724+
@pytest.mark.exclude_epoll
27182725
@pytest.mark.asyncio
27192726
@dfly_args({"proactor_threads": 4, "cluster_mode": "yes", "migration_buckets_cpu_budget": 1})
27202727
async def test_migration_timeout_on_sync(df_factory: DflyInstanceFactory, df_seeder_factory):
@@ -2874,6 +2881,7 @@ async def test_migration_one_after_another(df_factory: DflyInstanceFactory, df_s
28742881

28752882

28762883
@pytest.mark.slow
2884+
@pytest.mark.exclude_epoll
28772885
@pytest.mark.asyncio
28782886
@dfly_args({"proactor_threads": 4, "cluster_mode": "yes", "pause_wait_timeout": 10})
28792887
async def test_migration_rebalance_node(df_factory: DflyInstanceFactory, df_seeder_factory):

tests/dragonfly/replication_test.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,7 @@ async def test_replication_info(df_factory: DflyInstanceFactory, df_seeder_facto
11581158

11591159

11601160
@pytest.mark.slow
1161+
@pytest.mark.exclude_epoll
11611162
async def test_flushall_in_full_sync(df_factory):
11621163
master = df_factory.create(proactor_threads=4)
11631164
replica = df_factory.create(proactor_threads=2)
@@ -1245,6 +1246,7 @@ async def test_readonly_script(df_factory):
12451246
]
12461247

12471248

1249+
@pytest.mark.exclude_epoll
12481250
@pytest.mark.parametrize("master_threads, replica_threads", take_over_cases)
12491251
async def test_take_over_counters(df_factory, master_threads, replica_threads):
12501252
master = df_factory.create(proactor_threads=master_threads)
@@ -1299,6 +1301,7 @@ async def delayed_takeover():
12991301
assert client_value == int(replicated_value)
13001302

13011303

1304+
@pytest.mark.exclude_epoll
13021305
@pytest.mark.parametrize("master_threads, replica_threads", take_over_cases)
13031306
async def test_take_over_seeder(
13041307
request, df_factory, df_seeder_factory, master_threads, replica_threads
@@ -1574,6 +1577,7 @@ async def test_tls_replication_without_ca(
15741577
assert 100 == await c_replica.execute_command("dbsize")
15751578

15761579

1580+
@pytest.mark.exclude_epoll
15771581
async def test_ipv6_replication(df_factory: DflyInstanceFactory):
15781582
"""Test that IPV6 addresses work for replication, ::1 is 127.0.0.1 localhost"""
15791583
master = df_factory.create(proactor_threads=1, bind="::1", port=1111)
@@ -2412,6 +2416,7 @@ async def test_replication_timeout_on_full_sync(df_factory: DflyInstanceFactory,
24122416
await assert_replica_reconnections(replica, 0)
24132417

24142418

2419+
@pytest.mark.exclude_epoll
24152420
@dfly_args({"proactor_threads": 1})
24162421
async def test_master_stalled_disconnect(df_factory: DflyInstanceFactory):
24172422
# disconnect after 1 second of being blocked
@@ -2760,6 +2765,7 @@ async def test_replication_timeout_on_full_sync_heartbeat_expiry(
27602765
await assert_replica_reconnections(replica, 0)
27612766

27622767

2768+
@pytest.mark.exclude_epoll
27632769
@dfly_args({"proactor_threads": 1})
27642770
async def test_memory_on_big_string_loading(df_factory):
27652771
"""
@@ -2800,6 +2806,7 @@ async def get_memory(client, field):
28002806
assert master_data == replica_data
28012807

28022808

2809+
@pytest.mark.exclude_epoll
28032810
@pytest.mark.parametrize(
28042811
"element_size, elements_number",
28052812
[(16, 30000), (30000, 16)],

0 commit comments

Comments
 (0)