From 01af40d6b6cf3e00099bdf67ace2172cd41d0bfa Mon Sep 17 00:00:00 2001
From: HaoranYi <haoran.yi@gmail.com>
Date: Fri, 25 Mar 2022 14:38:19 -0500
Subject: [PATCH] Fix intermittent validator_exit test failure (#23594)

* run validator_exit_test sequentially

* limit validator exit run to its own serial run subset
add 10ms delay in the validator exit tests

* fix intermittent validator exit failure

* no sleep

* undo the code move
---
 core/src/validator.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/validator.rs b/core/src/validator.rs
index 80dec8d4f6..f71f0cd831 100644
--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -1800,7 +1800,6 @@ mod tests {
         std::fs::remove_dir_all,
     };
 
-    #[test]
     fn validator_exit() {
         solana_logger::setup();
         let leader_keypair = Keypair::new();
@@ -1880,7 +1879,6 @@ mod tests {
         }
     }
 
-    #[test]
     fn validator_parallel_exit() {
         let leader_keypair = Keypair::new();
         let leader_node = Node::new_localhost_with_pubkey(&leader_keypair.pubkey());
@@ -1928,6 +1926,12 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_validator_exit() {
+        validator_exit();
+        validator_parallel_exit();
+    }
+
     #[test]
     fn test_wait_for_supermajority() {
         solana_logger::setup();