mixandClaude Opus 5.5
0ed03b2094
test / test (push) Canceled after 0s
Expiry (assumptions A-8). Postfix 3.7.11 logs the end of a message's queue lifetime once per message, "<id>: from=<..>, status=expired, returned to sender" (src/qmgr/qmgr_active.c, qmgr_active_done_25_generic()), with no line per recipient; the tailer waited for "to=..., status=expired", which no Postfix writes, and the sweep closed only queued rows, so such rows stayed deferred. The tailer now reads qmgr's line (ExpireMessage: each recipient's newest open row of the id becomes bounced); the sweep closes a deferred row too when Postfix no longer holds the message, and counts as missed only a final line (sent, bounced, expiry). The queue listing's '#' (forced expiry, showq_compat.c showq_message()) is read as a flag (B-PQ1). Time values (B-PQ10, B-PQ11): conv_time() ported - one number, one lower-case unit, the parameter's default unit when none (get_def_time_unit: d for the lifetimes, h for delay_warning_time), the rest ignored; postconf -h -x expands $name; bounce_queue_lifetime capped at maximal_queue_lifetime as qmgr_post_init() caps it, so LongestLifetime is the queue lifetime. Refusals (A-21, A-23, A-24, A-15): smtpd_whatsup() ends the NOQUEUE line with sasl_username=<login> on an authenticated session; the line is now matched to its row by client, login and sender, and a line without a login is no application's. The client= line's login ends at the comma. The "IPv6:" trim goes (namaddr is built from state->addr). A row recovered from cleanup's line says that line names the last recipient only. Stand (2026-10-14, make e2e, exit 0): new expired_message_is_closed - defer_transports=smtp makes the retry service defer the message, postsuper -e and postqueue -i force its expiry; mail.log has "<id>: from=<alerts@sender.e2e.test>, status=force-expired, returned to sender" and the row goes deferred -> bounced; refusals_show_postfixs_line passes with the login match. go vet and go test ./... pass on the server. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
73 lines
1.9 KiB
Go
73 lines
1.9 KiB
Go
package postfix
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// Postfix 3.7.11, src/global/conv_time.c, conv_time(): one number, one
|
|
// lower-case unit, the default unit when there is none, the rest ignored.
|
|
func TestParseTime(t *testing.T) {
|
|
cases := []struct {
|
|
in string
|
|
unit byte
|
|
want time.Duration
|
|
}{
|
|
{"5d", 's', 5 * 24 * time.Hour},
|
|
{"300s", 'd', 300 * time.Second},
|
|
{"4000s", 's', 4000 * time.Second},
|
|
{"1h", 's', time.Hour},
|
|
{"0", 's', 0},
|
|
{"0s", 's', 0},
|
|
{"300", 's', 300 * time.Second},
|
|
{"3", 'd', 3 * 24 * time.Hour}, // maximal_queue_lifetime = 3
|
|
{"2", 'h', 2 * time.Hour}, // delay_warning_time = 2
|
|
{" 300s ", 's', 300 * time.Second},
|
|
{"+5m", 's', 5 * time.Minute},
|
|
{"1h7m", 's', time.Hour}, // what follows the unit is ignored
|
|
{"1h 5x", 's', time.Hour},
|
|
{"1w", 's', 7 * 24 * time.Hour},
|
|
{"2m", 's', 2 * time.Minute},
|
|
{"s", 'd', 0}, // strtol() reads nothing and stops at the "s"
|
|
}
|
|
for _, tc := range cases {
|
|
got, err := ParseTime(tc.in, tc.unit)
|
|
if err != nil {
|
|
t.Errorf("ParseTime(%q, %c): %v", tc.in, tc.unit, err)
|
|
continue
|
|
}
|
|
if got != tc.want {
|
|
t.Errorf("ParseTime(%q, %c) = %v, want %v", tc.in, tc.unit, got, tc.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestParseTimeRejectsInvalid(t *testing.T) {
|
|
for _, in := range []string{"", "foo", "5x", "-300s", "5D", "1H", " s", "99999999999s", "400000w"} {
|
|
if _, err := ParseTime(in, 's'); err == nil {
|
|
t.Errorf("ParseTime(%q) = nil, want error", in)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestFormatDuration(t *testing.T) {
|
|
cases := []struct {
|
|
in time.Duration
|
|
want string
|
|
}{
|
|
{5 * 24 * time.Hour, "5 days"},
|
|
{300 * time.Second, "5 minutes"},
|
|
{4000 * time.Second, "about 1 hour 7 minutes"},
|
|
{time.Hour, "1 hour"},
|
|
{0, "0 seconds"},
|
|
{time.Second, "1 second"},
|
|
{2 * time.Minute, "2 minutes"},
|
|
{24 * time.Hour, "1 day"},
|
|
}
|
|
for _, tc := range cases {
|
|
if got := FormatDuration(tc.in); got != tc.want {
|
|
t.Errorf("FormatDuration(%v) = %q, want %q", tc.in, got, tc.want)
|
|
}
|
|
}
|
|
}
|