Merge branch 'main' into test/flaky

ApeWorX · Jan 30, 2025 · 66ba32b · 66ba32b
2 parents bfd2416 + cb8adab
commit 66ba32b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/tests/functional/test_chain.py b/tests/functional/test_chain.py
@@ -153,6 +153,8 @@ def test_set_pending_timestamp(chain):
     assert new_timestamp - start_timestamp == 3600
 
 
+# Flakey due to x-dist.
+@pytest.mark.flaky(reruns=5)
 def test_set_pending_timestamp_with_deltatime(chain):
     start_timestamp = chain.pending_timestamp
     chain.mine(deltatime=5)