Skip to content

Commit 5b496fc

Browse files
authored
test: unskip epoll cluster and replication tests (#5757)
1 parent 973d77b commit 5b496fc

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

tests/dragonfly/cluster_test.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,7 +1471,6 @@ 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
14751474
@dfly_args({"proactor_threads": 4, "cluster_mode": "yes", "migration_finalization_timeout_ms": 5})
14761475
async def test_network_disconnect_during_migration(df_factory):
14771476
instances = [
@@ -2029,7 +2028,6 @@ async def start_save():
20292028
# We can try to use FakeRedis with the DebugPopulateSeeder comparison here.
20302029

20312030

2032-
@pytest.mark.exclude_epoll
20332031
@dfly_args({"proactor_threads": 4, "cluster_mode": "yes"})
20342032
@pytest.mark.asyncio
20352033
async def test_cluster_migration_cancel(df_factory: DflyInstanceFactory):
@@ -2095,7 +2093,6 @@ async def node1size0():
20952093
@dfly_args({"proactor_threads": 2, "cluster_mode": "yes"})
20962094
@pytest.mark.asyncio
20972095
@pytest.mark.opt_only
2098-
@pytest.mark.exclude_epoll
20992096
async def test_cluster_migration_huge_container(df_factory: DflyInstanceFactory):
21002097
instances = [
21012098
df_factory.create(port=next(next_port), admin_port=next(next_port)) for i in range(2)
@@ -2157,7 +2154,6 @@ async def test_cluster_migration_huge_container(df_factory: DflyInstanceFactory)
21572154
)
21582155
@pytest.mark.parametrize("chunk_size", [1_000_000, 30])
21592156
@pytest.mark.asyncio
2160-
@pytest.mark.exclude_epoll
21612157
async def test_cluster_migration_while_seeding(
21622158
df_factory: DflyInstanceFactory, df_seeder_factory: DflySeederFactory, chunk_size
21632159
):
@@ -2305,7 +2301,6 @@ async def await_no_lag(client: aioredis.Redis, timeout=10):
23052301
raise RuntimeError("Lag did not reduced to 0!")
23062302

23072303

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

25172512

2518-
@pytest.mark.exclude_epoll
25192513
@dfly_args({"proactor_threads": 4})
25202514
async def test_replicate_redis_cluster(redis_cluster, df_factory, df_seeder_factory):
25212515
"""
@@ -2721,7 +2715,6 @@ async def test_cluster_memory_consumption_migration(df_factory: DflyInstanceFact
27212715
await check_for_no_state_status([node.admin_client for node in nodes])
27222716

27232717

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

28822875

28832876
@pytest.mark.slow
2884-
@pytest.mark.exclude_epoll
28852877
@pytest.mark.asyncio
28862878
@dfly_args({"proactor_threads": 4, "cluster_mode": "yes", "pause_wait_timeout": 10})
28872879
async def test_migration_rebalance_node(df_factory: DflyInstanceFactory, df_seeder_factory):

tests/dragonfly/replication_test.py

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

11591159

11601160
@pytest.mark.slow
1161-
@pytest.mark.exclude_epoll
11621161
async def test_flushall_in_full_sync(df_factory):
11631162
master = df_factory.create(proactor_threads=4)
11641163
replica = df_factory.create(proactor_threads=2)
@@ -1246,7 +1245,6 @@ async def test_readonly_script(df_factory):
12461245
]
12471246

12481247

1249-
@pytest.mark.exclude_epoll
12501248
@pytest.mark.parametrize("master_threads, replica_threads", take_over_cases)
12511249
async def test_take_over_counters(df_factory, master_threads, replica_threads):
12521250
master = df_factory.create(proactor_threads=master_threads)
@@ -1301,7 +1299,6 @@ async def delayed_takeover():
13011299
assert client_value == int(replicated_value)
13021300

13031301

1304-
@pytest.mark.exclude_epoll
13051302
@pytest.mark.parametrize("master_threads, replica_threads", take_over_cases)
13061303
async def test_take_over_seeder(
13071304
request, df_factory, df_seeder_factory, master_threads, replica_threads
@@ -1577,7 +1574,6 @@ async def test_tls_replication_without_ca(
15771574
assert 100 == await c_replica.execute_command("dbsize")
15781575

15791576

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

24182414

2419-
@pytest.mark.exclude_epoll
24202415
@dfly_args({"proactor_threads": 1})
24212416
async def test_master_stalled_disconnect(df_factory: DflyInstanceFactory):
24222417
# disconnect after 1 second of being blocked
@@ -2765,7 +2760,6 @@ async def test_replication_timeout_on_full_sync_heartbeat_expiry(
27652760
await assert_replica_reconnections(replica, 0)
27662761

27672762

2768-
@pytest.mark.exclude_epoll
27692763
@dfly_args({"proactor_threads": 1})
27702764
async def test_memory_on_big_string_loading(df_factory):
27712765
"""
@@ -2806,7 +2800,6 @@ async def get_memory(client, field):
28062800
assert master_data == replica_data
28072801

28082802

2809-
@pytest.mark.exclude_epoll
28102803
@pytest.mark.parametrize(
28112804
"element_size, elements_number",
28122805
[(16, 30000), (30000, 16)],

0 commit comments

Comments
 (0)