Merge pull request #1996 from Expensify/tyler-improve-test

Improve shutdown of test
Expensify · Dec 3, 2024 · b6f3e8e · b6f3e8e
2 parents 164a5db + f32265f
commit b6f3e8e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/test/clustertest/tests/ForkedNodeApprovalTest.cpp b/test/clustertest/tests/ForkedNodeApprovalTest.cpp
@@ -152,5 +152,10 @@ struct ForkedNodeApprovalTest : tpunit::TestFixture {
         // Ok, now we can start the second follower back up and secondary leader should be able to lead.
         tester.getTester(2).startServer(false);
         ASSERT_TRUE(tester.getTester(1).waitForState("LEADING"));
+
+        // We call stopServer on the forked leader because it crashed, but the cluster tester doesn't realize, so shutting down
+        // normally will time out after a minute. Calling `stopServer` explicitly will clear the server PID, and we won't need
+        // to wait for this timeout.
+        tester.getTester(0).stopServer();
     }
 } __ForkedNodeApprovalTest;