Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 17:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use the LogSink explicitly in securejoin tests

Browse Source
This commit is contained in:
Floris Bruynooghe
2021-12-16 18:57:00 +01:00
parent db58946312
commit 2e2d881e01
2 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/securejoin.rs
View File

@@ -941,12 +941,21 @@ mod tests {
use crate::chatlist::Chatlist; use crate::chatlist::Chatlist;
use crate::constants::Chattype; use crate::constants::Chattype;
use crate::peerstate::Peerstate; use crate::peerstate::Peerstate;
use crate::test_utils::TestContext; use crate::test_utils::{LogSink, TestContext};
#[async_std::test] #[async_std::test]
async fn test_setup_contact() -> Result<()> { async fn test_setup_contact() -> Result<()> {
let alice = TestContext::new_alice().await; let (log_tx, _log_sink) = LogSink::create();
let bob = TestContext::new_bob().await; let alice = TestContext::builder()
.configure_alice()
.with_log_sink(log_tx.clone())
.build()
.await;
let bob = TestContext::builder()
.configure_bob()
.with_log_sink(log_tx)
.build()
.await;
assert_eq!(Chatlist::try_load(&alice, 0, None, None).await?.len(), 0); assert_eq!(Chatlist::try_load(&alice, 0, None, None).await?.len(), 0);
assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 0); assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 0);
@@ -1133,8 +1142,17 @@ mod tests {
#[async_std::test] #[async_std::test]
async fn test_setup_contact_bob_knows_alice() -> Result<()> { async fn test_setup_contact_bob_knows_alice() -> Result<()> {
let alice = TestContext::new_alice().await; let (log_tx, _log_sink) = LogSink::create();
let bob = TestContext::new_bob().await; let alice = TestContext::builder()
.configure_alice()
.with_log_sink(log_tx.clone())
.build()
.await;
let bob = TestContext::builder()
.configure_bob()
.with_log_sink(log_tx)
.build()
.await;
// Ensure Bob knows Alice_FP // Ensure Bob knows Alice_FP
let alice_pubkey = SignedPublicKey::load_self(&alice.ctx).await?; let alice_pubkey = SignedPublicKey::load_self(&alice.ctx).await?;
@@ -1257,8 +1275,17 @@ mod tests {
#[async_std::test] #[async_std::test]
async fn test_setup_contact_concurrent_calls() -> Result<()> { async fn test_setup_contact_concurrent_calls() -> Result<()> {
let alice = TestContext::new_alice().await; let (log_tx, _log_sink) = LogSink::create();
let bob = TestContext::new_bob().await; let alice = TestContext::builder()
.configure_alice()
.with_log_sink(log_tx.clone())
.build()
.await;
let bob = TestContext::builder()
.configure_bob()
.with_log_sink(log_tx)
.build()
.await;
// do a scan that is not working as claire is never responding // do a scan that is not working as claire is never responding
let qr_stale = "OPENPGP4FPR:1234567890123456789012345678901234567890#a=claire%40foo.de&n=&i=12345678901&s=23456789012"; let qr_stale = "OPENPGP4FPR:1234567890123456789012345678901234567890#a=claire%40foo.de&n=&i=12345678901&s=23456789012";
@@ -1287,8 +1314,17 @@ mod tests {
#[async_std::test] #[async_std::test]
async fn test_secure_join() -> Result<()> { async fn test_secure_join() -> Result<()> {
let alice = TestContext::new_alice().await; let (log_tx, _log_sink) = LogSink::create();
let bob = TestContext::new_bob().await; let alice = TestContext::builder()
.configure_alice()
.with_log_sink(log_tx.clone())
.build()
.await;
let bob = TestContext::builder()
.configure_bob()
.with_log_sink(log_tx)
.build()
.await;
assert_eq!(Chatlist::try_load(&alice, 0, None, None).await?.len(), 0); assert_eq!(Chatlist::try_load(&alice, 0, None, None).await?.len(), 0);
assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 0); assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 0);

2
src/test_utils.rs
View File

@@ -570,7 +570,7 @@ pub struct LogSink {
impl LogSink { impl LogSink {
/// Creates a new [`LogSink`] and returns the attached event sink. /// Creates a new [`LogSink`] and returns the attached event sink.
fn create() -> (Sender<Event>, Self) { pub fn create() -> (Sender<Event>, Self) {
let (tx, rx) = channel::unbounded(); let (tx, rx) = channel::unbounded();
(tx, Self { events: rx }) (tx, Self { events: rx })
} }