From cb23070dfe40d9292549ebc5a6372b97cff94b39 Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Mon, 21 Jan 2019 11:36:26 -0800 Subject: [PATCH] Remove sleeps on fullnode spin-up in integration tests --- tests/rpc.rs | 1 - wallet/tests/pay.rs | 5 ----- wallet/tests/request_airdrop.rs | 3 --- 3 files changed, 9 deletions(-) diff --git a/tests/rpc.rs b/tests/rpc.rs index f00150bd97..3136fa8b71 100644 --- a/tests/rpc.rs +++ b/tests/rpc.rs @@ -58,7 +58,6 @@ fn test_rpc_send_tx() { None, STORAGE_ROTATE_TEST_COUNT, ); - sleep(Duration::from_millis(900)); let client = reqwest::Client::new(); let request = json!({ diff --git a/wallet/tests/pay.rs b/wallet/tests/pay.rs index 852eb1b1dc..a4528ce346 100644 --- a/wallet/tests/pay.rs +++ b/wallet/tests/pay.rs @@ -19,8 +19,6 @@ use solana_wallet::wallet::{ use std::fs::remove_dir_all; use std::sync::mpsc::channel; use std::sync::{Arc, RwLock}; -use std::thread::sleep; -use std::time::Duration; fn check_balance(expected_balance: u64, client: &RpcClient, params: Value) { let balance = client @@ -65,7 +63,6 @@ fn test_wallet_timestamp_tx() { None, STORAGE_ROTATE_TEST_COUNT, ); - sleep(Duration::from_millis(900)); let (sender, receiver) = channel(); run_local_drone(alice.keypair(), sender); @@ -163,7 +160,6 @@ fn test_wallet_witness_tx() { None, STORAGE_ROTATE_TEST_COUNT, ); - sleep(Duration::from_millis(900)); let (sender, receiver) = channel(); run_local_drone(alice.keypair(), sender); @@ -257,7 +253,6 @@ fn test_wallet_cancel_tx() { None, STORAGE_ROTATE_TEST_COUNT, ); - sleep(Duration::from_millis(900)); let (sender, receiver) = channel(); run_local_drone(alice.keypair(), sender); diff --git a/wallet/tests/request_airdrop.rs b/wallet/tests/request_airdrop.rs index a90977a5c1..42f5ff66e3 100644 --- a/wallet/tests/request_airdrop.rs +++ b/wallet/tests/request_airdrop.rs @@ -15,8 +15,6 @@ use solana_wallet::wallet::{process_command, WalletCommand, WalletConfig}; use std::fs::remove_dir_all; use std::sync::mpsc::channel; use std::sync::{Arc, RwLock}; -use std::thread::sleep; -use std::time::Duration; #[test] fn test_wallet_request_airdrop() { @@ -51,7 +49,6 @@ fn test_wallet_request_airdrop() { None, STORAGE_ROTATE_TEST_COUNT, ); - sleep(Duration::from_millis(900)); let (sender, receiver) = channel(); run_local_drone(alice.keypair(), sender);