From e23e22cb81fc9a4b9479bf80c50253ce4684a435 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Mon, 15 Oct 2018 18:02:09 +0300 Subject: [PATCH] removed extra assert in generation_session_is_removed_when_succeeded (#9738) --- secret_store/src/key_server_cluster/cluster.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/secret_store/src/key_server_cluster/cluster.rs b/secret_store/src/key_server_cluster/cluster.rs index 1c0986aad..8668da539 100644 --- a/secret_store/src/key_server_cluster/cluster.rs +++ b/secret_store/src/key_server_cluster/cluster.rs @@ -1385,13 +1385,16 @@ pub mod tests { && clusters[0].client().generation_session(&SessionId::default()).is_none()); assert!(session.joint_public_and_secret().unwrap().is_ok()); - // check that session is either removed from all nodes, or nonexistent (already removed) + // check that on non-master nodes session is either: + // already removed + // or it is removed right after completion for i in 1..3 { if let Some(session) = clusters[i].client().generation_session(&SessionId::default()) { + // run to completion if completion message is still on the way + // AND check that it is actually removed from cluster sessions loop_until(&mut core, TIMEOUT, || (session.state() == GenerationSessionState::Finished || session.state() == GenerationSessionState::Failed) && clusters[i].client().generation_session(&SessionId::default()).is_none()); - assert!(session.joint_public_and_secret().unwrap().is_err()); } } }