token-cli: Run tests in batches (#3396)

Author: joncinque

Cargo.lock

@@ -38,6 +38,7 @@ tokio = "1.14"
 [dev-dependencies]
 solana-test-validator = "=1.10.33"
 assert_cmd = "2.0.4"
+serial_test = "0.8.0"
 tempfile = "3.3.0"
 
 [[bin]]

token/cli/Cargo.toml

@@ -3283,6 +3283,7 @@ async fn handle_tx<'a>(
 mod tests {
     use {
         super::*,
+        serial_test::parallel,
         solana_sdk::{
             bpf_loader,
             signature::{write_keypair_file, Keypair, Signer},
@@ -3462,6 +3463,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(one)]
     async fn create_token_default() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3481,6 +3483,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(two)]
     async fn supply() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3499,6 +3502,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(one)]
     async fn create_account_default() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3519,6 +3523,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(two)]
     async fn account_info() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3551,6 +3556,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(one)]
     async fn balance() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3570,6 +3576,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(two)]
     async fn mint() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3597,6 +3604,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(one)]
     async fn balance_after_mint() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3618,6 +3626,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(two)]
     async fn accounts() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3641,6 +3650,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(one)]
     async fn wrap() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3668,6 +3678,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(two)]
     async fn unwrap() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3694,6 +3705,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(one)]
     async fn transfer() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3727,6 +3739,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(two)]
     async fn transfer_fund_recipient() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3759,6 +3772,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(one)]
     async fn failing_to_allow_non_system_account_recipient() {
         let (test_validator, payer) = new_validator_for_test().await;
         let config = test_config(&test_validator, &payer, &spl_token::id());
@@ -3785,6 +3799,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(two)]
     async fn allow_non_system_account_recipient() {
         let (test_validator, payer) = new_validator_for_test().await;
         let config = test_config(&test_validator, &payer, &spl_token::id());
@@ -3821,6 +3836,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(one)]
     async fn close_wrapped_sol_account() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3867,6 +3883,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(two)]
     async fn disable_mint_authority() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3893,6 +3910,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(one)]
     async fn gc() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3938,6 +3956,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(two)]
     async fn set_owner() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -3966,6 +3985,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(one)]
     async fn transfer_with_account_delegate() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {
@@ -4060,6 +4080,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[parallel(two)]
     async fn burn_with_account_delegate() {
         let (test_validator, payer) = new_validator_for_test().await;
         for program_id in [spl_token::id(), spl_token_2022::id()] {