infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 11:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix previous commit, add missing error check and minor test refactor.

Browse Source 
Unclear how I botched this up at the last minute before committing...
This commit is contained in:
Mechiel Lukkien 2025-03-07 10:30:55 +01:00
parent 51f58a52c9
commit d78aa9d1d7
No known key found for this signature in database
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
store/account.go
View File

@ -1208,6 +1208,7 @@ func OpenAccountDB(log mlog.Log, accountDir, accountName string) (a *Account, re
if err != nil { if err != nil {
p := filepath.Join(dir, e.Name()) p := filepath.Join(dir, e.Name())
log.Errorx("unrecognized file in message directory, parsing filename as number", err, slog.String("path", p)) log.Errorx("unrecognized file in message directory, parsing filename as number", err, slog.String("path", p))
} else {
maxFSID = max(maxFSID, id) maxFSID = max(maxFSID, id)
} }
} }

30
store/account_test.go
View File

@ -51,15 +51,11 @@ func TestMailbox(t *testing.T) {
defer Switchboard()() defer Switchboard()()
msgFile, err := CreateMessageTemp(log, "account-test") msgFile, err := CreateMessageTemp(log, "account-test")
if err != nil { tcheck(t, err, "create temp message file")
t.Fatalf("creating temp msg file: %s", err) defer CloseRemoveTempFile(log, msgFile, "temp message file")
}
defer os.Remove(msgFile.Name())
defer msgFile.Close()
msgWriter := message.NewWriter(msgFile) msgWriter := message.NewWriter(msgFile)
if _, err := msgWriter.Write([]byte(" message")); err != nil { _, err = msgWriter.Write([]byte(" message"))
t.Fatalf("writing to temp message: %s", err) tcheck(t, err, "write message")
}
msgPrefix := []byte("From: <mjl@mox.example\r\nTo: <mjl@mox.example>\r\nCc: <mjl@mox.example>Subject: test\r\nMessage-Id: <m01@mox.example>\r\n\r\n") msgPrefix := []byte("From: <mjl@mox.example\r\nTo: <mjl@mox.example>\r\nCc: <mjl@mox.example>Subject: test\r\nMessage-Id: <m01@mox.example>\r\n\r\n")
msgPrefixCatchall := []byte("Subject: catchall\r\n\r\n") msgPrefixCatchall := []byte("Subject: catchall\r\n\r\n")
@ -89,7 +85,7 @@ func TestMailbox(t *testing.T) {
tcheck(t, err, "sent mailbox") tcheck(t, err, "sent mailbox")
msent.MailboxID = mbsent.ID msent.MailboxID = mbsent.ID
msent.MailboxOrigID = mbsent.ID msent.MailboxOrigID = mbsent.ID
err = acc.MessageAdd(pkglog, tx, &mbsent, &msent, msgFile, AddOpts{SkipSourceFileSync: true, SkipDirSync: true}) err = acc.MessageAdd(log, tx, &mbsent, &msent, msgFile, AddOpts{SkipSourceFileSync: true, SkipDirSync: true})
tcheck(t, err, "deliver message") tcheck(t, err, "deliver message")
if !msent.ThreadMuted || !msent.ThreadCollapsed { if !msent.ThreadMuted || !msent.ThreadCollapsed {
t.Fatalf("thread muted & collapsed should have been copied from parent (duplicate message-id) m") t.Fatalf("thread muted & collapsed should have been copied from parent (duplicate message-id) m")
@ -104,7 +100,7 @@ func TestMailbox(t *testing.T) {
tcheck(t, err, "insert rejects mailbox") tcheck(t, err, "insert rejects mailbox")
mreject.MailboxID = mbrejects.ID mreject.MailboxID = mbrejects.ID
mreject.MailboxOrigID = mbrejects.ID mreject.MailboxOrigID = mbrejects.ID
err = acc.MessageAdd(pkglog, tx, &mbrejects, &mreject, msgFile, AddOpts{SkipSourceFileSync: true, SkipDirSync: true}) err = acc.MessageAdd(log, tx, &mbrejects, &mreject, msgFile, AddOpts{SkipSourceFileSync: true, SkipDirSync: true})
tcheck(t, err, "deliver message") tcheck(t, err, "deliver message")
err = tx.Update(&mbrejects) err = tx.Update(&mbrejects)
tcheck(t, err, "update mbrejects") tcheck(t, err, "update mbrejects")
@ -113,7 +109,7 @@ func TestMailbox(t *testing.T) {
}) })
tcheck(t, err, "deliver as sent and rejects") tcheck(t, err, "deliver as sent and rejects")
err = acc.DeliverDestination(pkglog, conf.Destinations["mjl"], &mconsumed, msgFile) err = acc.DeliverDestination(log, conf.Destinations["mjl"], &mconsumed, msgFile)
tcheck(t, err, "deliver with consume") tcheck(t, err, "deliver with consume")
err = acc.DB.Write(ctxbg, func(tx *bstore.Tx) error { err = acc.DB.Write(ctxbg, func(tx *bstore.Tx) error {
@ -265,10 +261,10 @@ func TestMailbox(t *testing.T) {
} }
func TestMessageRuleset(t *testing.T) { func TestMessageRuleset(t *testing.T) {
f, err := CreateMessageTemp(pkglog, "msgruleset") log := mlog.New("store", nil)
f, err := CreateMessageTemp(log, "msgruleset")
tcheck(t, err, "creating temp msg file") tcheck(t, err, "creating temp msg file")
defer os.Remove(f.Name()) defer CloseRemoveTempFile(log, f, "temp message file")
defer f.Close()
msgBuf := []byte(strings.ReplaceAll(`List-ID: <test.mox.example> msgBuf := []byte(strings.ReplaceAll(`List-ID: <test.mox.example>
@ -296,7 +292,7 @@ Rulesets:
} }
dest.Rulesets[0].HeadersRegexpCompiled = hdrs dest.Rulesets[0].HeadersRegexpCompiled = hdrs
c := MessageRuleset(pkglog, dest, &Message{}, msgBuf, f) c := MessageRuleset(log, dest, &Message{}, msgBuf, f)
if c == nil { if c == nil {
t.Fatalf("expected ruleset match") t.Fatalf("expected ruleset match")
} }
@ -305,7 +301,7 @@ Rulesets:
test test
`, "\n", "\r\n")) `, "\n", "\r\n"))
c = MessageRuleset(pkglog, dest, &Message{}, msg2Buf, f) c = MessageRuleset(log, dest, &Message{}, msg2Buf, f)
if c != nil { if c != nil {
t.Fatalf("expected no ruleset match") t.Fatalf("expected no ruleset match")
} }
@ -338,8 +334,10 @@ func TestNextMessageID(t *testing.T) {
msgPathBogus := filepath.Join(msgDir, "a", "bogus") msgPathBogus := filepath.Join(msgDir, "a", "bogus")
err = os.WriteFile(msgPathBogus, []byte("test"), 0700) err = os.WriteFile(msgPathBogus, []byte("test"), 0700)
tcheck(t, err, "create message file")
msgPathBadID := filepath.Join(msgDir, "a", "10000") // Out of range. msgPathBadID := filepath.Join(msgDir, "a", "10000") // Out of range.
err = os.WriteFile(msgPathBadID, []byte("test"), 0700) err = os.WriteFile(msgPathBadID, []byte("test"), 0700)
tcheck(t, err, "create message file")
// Open account. This should increase the next message ID. // Open account. This should increase the next message ID.
acc, err = OpenAccount(log, "mjl", false) acc, err = OpenAccount(log, "mjl", false)