Merge branch 'main' into f/long-test-e2e

microsoft · Jan 10, 2025 · 0538857 · 0538857
2 parents b59f615 + c115b6d
commit 0538857
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -146,5 +146,5 @@ jobs:
           # Unit tests
           ./tests.sh --output-on-failure -L unit -j$(nproc --all)
           # All other acceptably fast tests, which are now supported on Mariner.
-          ./tests.sh --timeout 360 --output-on-failure -LE "benchmark|protocolstest|suite|unit|lts_compatibility|raft_scenario"
+          ./tests.sh --timeout 360 --output-on-failure -LE "benchmark|protocolstest|suite|unit|lts_compatibility"
         shell: bash
diff --git a/tests/raft_scenarios/reconfig_01_23 b/tests/raft_scenarios/reconfig_01_23
@@ -42,13 +42,14 @@ assert_commit_idx,0,8
 assert_detail,0,leadership_state,None
 assert_detail,0,retirement_phase,RetiredCommitted
 
-# 2 becomes leader
-assert_detail,2,leadership_state,Leader
+# One of the continuing nodes has become leader
 emit_signature,3
 periodic_all,10
 dispatch_all
+periodic_all,10
 dispatch_all
 assert_commit_idx,2,9
+assert_commit_idx,3,9
 
 # 0 becomes a follower again, because it receives messages
 # from 2 before 2 realises 0 is retired committed.
@@ -65,5 +66,7 @@ replicate,3,some_tx
 emit_signature,3
 periodic_all,10
 dispatch_all
+periodic_all,10
 dispatch_all
-assert_commit_idx,2,11
+assert_commit_idx,2,11
+assert_commit_idx,3,11
diff --git a/tests/raft_scenarios/reconfig_01_el0_23 b/tests/raft_scenarios/reconfig_01_el0_23
@@ -91,5 +91,7 @@ replicate,5,some_tx
 emit_signature,5
 periodic_all,10
 dispatch_all
+periodic_all,10
 dispatch_all
-assert_commit_idx,2,13
+assert_commit_idx,2,13
+assert_commit_idx,3,13