Skip to content

wip: refactor log sink #8587

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

Draft
j-g00da wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

wip: refactor log sink #8587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/automatic_relay_management/automatic_relay_management_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,7 @@ async fn test_maybe_add_additional_relays_failure() -> Result<()> {
t.assert_warns_or_errors(&[
"DNS lookup with memory cache failure",
"Could not find DNS resolutions",
])
.await;
]);

Ok(())
}
Expand Down
44 changes: 22 additions & 22 deletions src/calls/calls_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ async fn setup_call() -> Result<CallSetup> {
for (t, m) in [(&bob, &bob_call), (&bob2, &bob2_call)] {
assert!(!m.is_info());
assert_eq!(m.viewtype, Viewtype::Call);
t.evtracker
t.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::IncomingCall { .. }))
.await;
let info = t
Expand Down Expand Up @@ -129,7 +129,7 @@ async fn accept_call() -> Result<CallSetup> {
1
);
assert_text(&bob, bob_call.id, "Incoming video call").await?;
bob.evtracker
bob.get_evtracker()
.get_matching(|evt| {
matches!(
evt,
Expand All @@ -151,7 +151,7 @@ async fn accept_call() -> Result<CallSetup> {

bob2.recv_msg_trash(&sent2).await;
assert_text(&bob, bob_call.id, "Incoming video call").await?;
bob2.evtracker
bob2.get_evtracker()
.get_matching(|evt| {
matches!(
evt,
Expand All @@ -173,7 +173,7 @@ async fn accept_call() -> Result<CallSetup> {
alice.recv_msg_trash(&sent2).await;
assert_text(&alice, alice_call.id, "Outgoing video call").await?;
let ev = alice
.evtracker
.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::OutgoingCallAccepted { .. }))
.await;
assert_eq!(
Expand All @@ -195,7 +195,7 @@ async fn accept_call() -> Result<CallSetup> {
alice2.recv_msg_trash(&sent2).await;
assert_text(&alice2, alice2_call.id, "Outgoing video call").await?;
alice2
.evtracker
.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::OutgoingCallAccepted { .. }))
.await;
assert_eq!(
Expand Down Expand Up @@ -244,7 +244,7 @@ async fn test_accept_call_callee_ends() -> Result<()> {
1
);
assert_text(&bob, bob_call.id, "Incoming video call\n<1 minute").await?;
bob.evtracker
bob.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
let sent3 = bob.pop_sent_msg().await;
Expand All @@ -255,7 +255,7 @@ async fn test_accept_call_callee_ends() -> Result<()> {

bob2.recv_msg_trash(&sent3).await;
assert_text(&bob2, bob2_call.id, "Incoming video call\n<1 minute").await?;
bob2.evtracker
bob2.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert!(matches!(
Expand All @@ -267,7 +267,7 @@ async fn test_accept_call_callee_ends() -> Result<()> {
alice.recv_msg_trash(&sent3).await;
assert_text(&alice, alice_call.id, "Outgoing video call\n<1 minute").await?;
alice
.evtracker
.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert!(matches!(
Expand All @@ -278,7 +278,7 @@ async fn test_accept_call_callee_ends() -> Result<()> {
alice2.recv_msg_trash(&sent3).await;
assert_text(&alice2, alice2_call.id, "Outgoing video call\n<1 minute").await?;
alice2
.evtracker
.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert!(matches!(
Expand Down Expand Up @@ -308,7 +308,7 @@ async fn test_accept_call_caller_ends() -> Result<()> {
alice.end_call(alice_call.id).await?;
assert_text(&alice, alice_call.id, "Outgoing video call\n<1 minute").await?;
alice
.evtracker
.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
let sent3 = alice.pop_sent_msg().await;
Expand All @@ -320,7 +320,7 @@ async fn test_accept_call_caller_ends() -> Result<()> {
alice2.recv_msg_trash(&sent3).await;
assert_text(&alice2, alice2_call.id, "Outgoing video call\n<1 minute").await?;
alice2
.evtracker
.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert!(matches!(
Expand All @@ -331,7 +331,7 @@ async fn test_accept_call_caller_ends() -> Result<()> {
// Bob receives the ending message
bob.recv_msg_trash(&sent3).await;
assert_text(&bob, bob_call.id, "Incoming video call\n<1 minute").await?;
bob.evtracker
bob.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert!(matches!(
Expand All @@ -341,7 +341,7 @@ async fn test_accept_call_caller_ends() -> Result<()> {

bob2.recv_msg_trash(&sent3).await;
assert_text(&bob2, bob2_call.id, "Incoming video call\n<1 minute").await?;
bob2.evtracker
bob2.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert!(matches!(
Expand Down Expand Up @@ -381,15 +381,15 @@ async fn test_callee_rejects_call() -> Result<()> {
1
);
assert_text(&bob, bob_call.id, "Declined call").await?;
bob.evtracker
bob.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
let sent3 = bob.pop_sent_msg().await;
assert_eq!(call_state(&bob, bob_call.id).await?, CallState::Declined);

bob2.recv_msg_trash(&sent3).await;
assert_text(&bob2, bob2_call.id, "Declined call").await?;
bob2.evtracker
bob2.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert_eq!(call_state(&bob2, bob2_call.id).await?, CallState::Declined);
Expand All @@ -398,7 +398,7 @@ async fn test_callee_rejects_call() -> Result<()> {
alice.recv_msg_trash(&sent3).await;
assert_text(&alice, alice_call.id, "Declined call").await?;
alice
.evtracker
.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert_eq!(
Expand All @@ -409,7 +409,7 @@ async fn test_callee_rejects_call() -> Result<()> {
alice2.recv_msg_trash(&sent3).await;
assert_text(&alice2, alice2_call.id, "Declined call").await?;
alice2
.evtracker
.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert_eq!(
Expand Down Expand Up @@ -468,7 +468,7 @@ async fn test_caller_cancels_call() -> Result<()> {
alice.end_call(alice_call.id).await?;
assert_text(&alice, alice_call.id, "Canceled call").await?;
alice
.evtracker
.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
let sent3 = alice.pop_sent_msg().await;
Expand All @@ -480,7 +480,7 @@ async fn test_caller_cancels_call() -> Result<()> {
alice2.recv_msg_trash(&sent3).await;
assert_text(&alice2, alice2_call.id, "Canceled call").await?;
alice2
.evtracker
.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert_eq!(
Expand All @@ -491,7 +491,7 @@ async fn test_caller_cancels_call() -> Result<()> {
// Bob receives the ending message
bob.recv_msg_trash(&sent3).await;
assert_text(&bob, bob_call.id, "Missed call").await?;
bob.evtracker
bob.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert_eq!(call_state(&bob, bob_call.id).await?, CallState::Missed);
Expand All @@ -503,7 +503,7 @@ async fn test_caller_cancels_call() -> Result<()> {

bob2.recv_msg_trash(&sent3).await;
assert_text(&bob2, bob2_call.id, "Missed call").await?;
bob2.evtracker
bob2.get_evtracker()
.get_matching(|evt| matches!(evt, EventType::CallEnded { .. }))
.await;
assert_eq!(call_state(&bob2, bob2_call.id).await?, CallState::Missed);
Expand Down Expand Up @@ -679,7 +679,7 @@ async fn test_end_text_call() -> Result<()> {
.unwrap();
assert_eq!(received2.msg_ids.len(), 1);
assert_eq!(received2.chat_id, DC_CHAT_ID_TRASH);
alice.assert_warn("does not refer to a call message").await;
alice.assert_warn("does not refer to a call message");

Ok(())
}
Loading