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

Add missing wlocks around message delivery to account, mostly for tests.

Browse Source
This commit is contained in:
Mechiel Lukkien
2025-03-03 23:59:43 +01:00
parent 2da280f2bb
commit 684c716e4d
7 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
webmail/webmail_test.go
View File

@ -264,28 +264,30 @@ type testmsg struct {
}
func tdeliver(t *testing.T, acc *store.Account, tm *testmsg) {
msgFile, err := store.CreateMessageTemp(pkglog, "webmail-test")
tcheck(t, err, "create message temp")
defer os.Remove(msgFile.Name())
defer msgFile.Close()
size, err := msgFile.Write(tm.msg.Marshal(t))
tcheck(t, err, "write message temp")
m := store.Message{
Flags: tm.Flags,
RcptToLocalpart: "mox",
RcptToDomain: "other.example",
MsgFromLocalpart: "mjl",
MsgFromDomain: "mox.example",
DKIMDomains: []string{"mox.example"},
Keywords: tm.Keywords,
Size: int64(size),
}
err = acc.DeliverMailbox(pkglog, tm.Mailbox, &m, msgFile)
tcheck(t, err, "deliver test message")
err = msgFile.Close()
tcheck(t, err, "closing test message")
tm.m = m
tm.ID = m.ID
acc.WithWLock(func() {
msgFile, err := store.CreateMessageTemp(pkglog, "webmail-test")
tcheck(t, err, "create message temp")
defer os.Remove(msgFile.Name())
defer msgFile.Close()
size, err := msgFile.Write(tm.msg.Marshal(t))
tcheck(t, err, "write message temp")
m := store.Message{
Flags: tm.Flags,
RcptToLocalpart: "mox",
RcptToDomain: "other.example",
MsgFromLocalpart: "mjl",
MsgFromDomain: "mox.example",
DKIMDomains: []string{"mox.example"},
Keywords: tm.Keywords,
Size: int64(size),
}
err = acc.DeliverMailbox(pkglog, tm.Mailbox, &m, msgFile)
tcheck(t, err, "deliver test message")
err = msgFile.Close()
tcheck(t, err, "closing test message")
tm.m = m
tm.ID = m.ID
})
}
func readBody(r io.Reader) string {