Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix flakey rust tests #3435

Merged
merged 2 commits into from
Oct 8, 2021
Merged

fix: fix flakey rust tests #3435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76bd13d
fix: fix flakey rust tests
philipr-za Oct 8, 2021
b53c0a1
Merge branch 'development' into philip-flakey-tests
aviator-app[bot] Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions base_layer/wallet/tests/output_manager_service/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ use tari_wallet::{
output_manager_service::{
config::OutputManagerServiceConfig,
error::{OutputManagerError, OutputManagerStorageError},
handle::OutputManagerHandle,
handle::{OutputManagerEvent, OutputManagerHandle},
service::OutputManagerService,
storage::{
database::{OutputManagerBackend, OutputManagerDatabase},
Expand All @@ -82,6 +82,7 @@ use tari_wallet::{
use tokio::{
sync::{broadcast, broadcast::channel},
task,
time::sleep,
};

#[allow(clippy::type_complexity)]
Expand Down Expand Up @@ -1347,7 +1348,9 @@ async fn test_txo_validation() {
query_deleted_response.best_block = [8u8; 16].to_vec();
rpc_service_state.set_query_deleted_response(query_deleted_response);

oms.validate_txos().await.unwrap();
let mut event_stream = oms.get_event_stream();

let validation_id = oms.validate_txos().await.unwrap();

let _utxo_query_calls = rpc_service_state
.wait_pop_utxo_query_calls(1, Duration::from_secs(60))
Expand All @@ -1359,6 +1362,26 @@ async fn test_txo_validation() {
.await
.unwrap();

let delay = sleep(Duration::from_secs(30));
tokio::pin!(delay);
let mut validation_completed = false;
loop {
tokio::select! {
event = event_stream.recv() => {
if let OutputManagerEvent::TxoValidationSuccess(id) = &*event.unwrap(){
if id == &validation_id {
validation_completed = true;
break;
}
}
},
() = &mut delay => {
break;
},
}
}
assert!(validation_completed, "Validation protocol should complete");

let balance = oms.get_balance().await.unwrap();
assert_eq!(
balance.available_balance,
Expand Down
26 changes: 13 additions & 13 deletions base_layer/wallet/tests/transaction_service/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3762,8 +3762,8 @@ fn test_transaction_resending() {
factories.clone(),
connection,
Some(TransactionServiceConfig {
transaction_resend_period: Duration::from_secs(10),
resend_response_cooldown: Duration::from_secs(5),
transaction_resend_period: Duration::from_secs(20),
resend_response_cooldown: Duration::from_secs(10),
..Default::default()
}),
);
Expand All @@ -3786,7 +3786,7 @@ fn test_transaction_resending() {

// Check that there were repeats
alice_outbound_service
.wait_call_count(2, Duration::from_secs(30))
.wait_call_count(2, Duration::from_secs(60))
.expect("Alice call wait 1");

let mut alice_sender_message = TransactionSenderMessage::None;
Expand Down Expand Up @@ -3824,8 +3824,8 @@ fn test_transaction_resending() {
factories,
connection,
Some(TransactionServiceConfig {
transaction_resend_period: Duration::from_secs(10),
resend_response_cooldown: Duration::from_secs(5),
transaction_resend_period: Duration::from_secs(20),
resend_response_cooldown: Duration::from_secs(10),
..Default::default()
}),
);
Expand All @@ -3840,7 +3840,7 @@ fn test_transaction_resending() {

// Check that the reply was repeated
bob_outbound_service
.wait_call_count(2, Duration::from_secs(30))
.wait_call_count(2, Duration::from_secs(60))
.expect("Bob call wait 1");

let mut bob_reply_message;
Expand All @@ -3861,16 +3861,16 @@ fn test_transaction_resending() {

assert!(bob_outbound_service.wait_call_count(1, Duration::from_secs(2)).is_err());

// Wait for the cooldown to expire but before the resend period has elapsed see if a repeat illicts a reponse.
runtime.block_on(async { sleep(Duration::from_secs(2)).await });
// Wait for the cooldown to expire but before the resend period has elapsed see if a repeat illicits a response.
runtime.block_on(async { sleep(Duration::from_secs(8)).await });
runtime
.block_on(bob_tx_sender.send(create_dummy_message(
alice_sender_message.into(),
alice_node_identity.public_key(),
)))
.unwrap();
bob_outbound_service
.wait_call_count(2, Duration::from_secs(30))
.wait_call_count(2, Duration::from_secs(60))
.expect("Bob call wait 2");
let _ = bob_outbound_service.pop_call().unwrap();
let call = bob_outbound_service.pop_call().unwrap();
Expand All @@ -3888,7 +3888,7 @@ fn test_transaction_resending() {
.unwrap();

alice_outbound_service
.wait_call_count(2, Duration::from_secs(30))
.wait_call_count(2, Duration::from_secs(60))
.expect("Alice call wait 2");

let _ = alice_outbound_service.pop_call().unwrap();
Expand All @@ -3905,11 +3905,11 @@ fn test_transaction_resending() {
.unwrap();

assert!(alice_outbound_service
.wait_call_count(1, Duration::from_secs(4))
.wait_call_count(1, Duration::from_secs(5))
.is_err());

// Wait for the cooldown to expire but before the resend period has elapsed see if a repeat illicts a reponse.
runtime.block_on(async { sleep(Duration::from_secs(2)).await });
// Wait for the cooldown to expire but before the resend period has elapsed see if a repeat illicts a response.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol

Suggested change
// Wait for the cooldown to expire but before the resend period has elapsed see if a repeat illicts a response.
// Wait for the cooldown to expire but before the resend period has elapsed see if a repeat elicits a response.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol

runtime.block_on(async { sleep(Duration::from_secs(6)).await });

runtime
.block_on(alice_tx_reply_sender.send(create_dummy_message(
Expand Down