infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-13 23:34:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

queue: when shutting down, wait for pending deliveries before signaling that shutdown is complete

Browse Source 
also fixes flaky test, which is how i found it
This commit is contained in:
Mechiel Lukkien
2024-04-28 22:48:51 +02:00
parent ff6cca1bf9
commit b7ec84b80a
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
queue/queue_test.go
View File

@ -1183,7 +1183,7 @@ func TestQueueStart(t *testing.T) {
_, cleanup := setup(t)
defer cleanup()
done := make(chan struct{}, 4)
done := make(chan struct{})
defer func() {
mox.ShutdownCancel()
// Wait for message and hooks deliverers and cleaners.
@ -1269,7 +1269,6 @@ func TestQueueStart(t *testing.T) {
t.Fatalf("kick changed %d messages, expected 1", n)
}
checkDialed(true)
time.Sleep(100 * time.Millisecond) // Racy... we won't get notified when work is done...
// Submit another, should be delivered immediately without HoldRule.
path = smtp.Path{Localpart: "mjl", IPDomain: dns.IPDomain{Domain: dns.Domain{ASCII: "mox.example"}}}
@ -1280,8 +1279,6 @@ func TestQueueStart(t *testing.T) {
err = Add(ctxbg, pkglog, "mjl", mf, qm)
tcheck(t, err, "add message to queue for delivery")
checkDialed(true) // Immediate.
time.Sleep(100 * time.Millisecond) // Racy... give time to finish.
}
func TestListFilterSort(t *testing.T) {