mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-05 22:17:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

target/queue: Fix use of the same ID for all attempts

Browse source 
It was meant to be different, but deliveryTarget.Start was actually
called using the original ID.
This commit is contained in:
fox.cpp 2019-11-21 18:50:27 +03:00
parent bf2c612ad0
commit 741790abfd
No known key found for this signature in database
GPG key ID: E76D97CCEDE90B6C
3 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
target/queue/queue_test.go
View file

@ -228,7 +228,7 @@ func TestQueueDelivery(t *testing.T) {
q := newTestQueue(t, &dt)
defer cleanQueue(t, q)
testutils.DoTestDelivery(t, q, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"})
encID := testutils.DoTestDelivery(t, q, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"})
// This is far from being a proper blackbox testing.
// But I can't come up with a better way to inspect the Queue state.
@ -240,7 +240,7 @@ func TestQueueDelivery(t *testing.T) {
msg := readMsgChanTimeout(t, dt.committed, 5*time.Second)
q.Close()
testutils.CheckMsg(t, msg, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"}, encID+"-1")
// There should be no queued messages.
checkQueueDir(t, q, []string{})
@ -306,14 +306,14 @@ func TestQueueDelivery_TemporaryFail(t *testing.T) {
q := newTestQueue(t, &dt)
defer cleanQueue(t, q)
testutils.DoTestDelivery(t, q, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"})
encID := testutils.DoTestDelivery(t, q, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"})
// Delivery should be aborted, because it failed for all recipients.
readMsgChanTimeout(t, dt.aborted, 5*time.Second)
// Second retry, should work fine.
msg := readMsgChanTimeout(t, dt.committed, 5*time.Second)
testutils.CheckMsg(t, msg, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"}, encID+"-2")
q.Close()
// No more retries scheduled, queue storage is clear.
@ -335,18 +335,18 @@ func TestQueueDelivery_TemporaryFail_Partial(t *testing.T) {
q := newTestQueue(t, &dt)
defer cleanQueue(t, q)
testutils.DoTestDelivery(t, q, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"})
encID := testutils.DoTestDelivery(t, q, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"})
// Committed, tester1@example.org - ok.
msg := readMsgChanTimeout(t, dt.committed, 5000*time.Second)
// Side note: unreliableTarget adds recipients to the msg object even if they were rejected
// later using a partial error. So slice below is all recipients that were submitted by
// the queue.
testutils.CheckMsg(t, msg, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"}, encID+"-1")
// committed #2, tester2@example.org - ok
msg = readMsgChanTimeout(t, dt.committed, 5000*time.Second)
testutils.CheckMsg(t, msg, "tester@example.com", []string{"tester2@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester2@example.org"}, encID+"-2")
q.Close()
// No more retries scheduled, queue storage is clear.
@ -359,30 +359,34 @@ func TestQueueDelivery_MultipleAttempts(t *testing.T) {
dt := unreliableTarget{
bodyFailuresPartial: []map[string]error{
{
"tester1@example.org": exterrors.WithTemporary(errors.New("you shall not pass"), false),
"tester2@example.org": exterrors.WithTemporary(errors.New("you shall not pass"), true),
"tester1@example.org": exterrors.WithTemporary(errors.New("you shall not pass 1"), false),
"tester2@example.org": exterrors.WithTemporary(errors.New("you shall not pass 2"), true),
},
{
"tester2@example.org": exterrors.WithTemporary(errors.New("you shall not pass"), true),
"tester2@example.org": exterrors.WithTemporary(errors.New("you shall not pass 3"), true),
},
},
committed: make(chan testutils.Msg, 10),
aborted: make(chan testutils.Msg, 10),
}
q := newTestQueue(t, &dt)
defer cleanQueue(t, q)
testutils.DoTestDelivery(t, q, "tester@example.com", []string{"tester1@example.org", "tester2@example.org", "tester3@example.org"})
encID := testutils.DoTestDelivery(t, q, "tester@example.com", []string{"tester1@example.org", "tester2@example.org", "tester3@example.org"})
// Committed because delivery to tester3@example.org is succeeded.
msg := readMsgChanTimeout(t, dt.committed, 5*time.Second)
// Side note: This slice contains all recipients submitted by the queue, even if
// they were rejected later using partialError.
testutils.CheckMsg(t, msg, "tester@example.com", []string{"tester1@example.org", "tester2@example.org", "tester3@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester1@example.org", "tester2@example.org", "tester3@example.org"}, encID+"-1")
// tester1 is failed permanently, should not be retried.
// tester2 is failed temporary, should be retried.
msg = readMsgChanTimeout(t, dt.aborted, 5*time.Second)
// Third attempt... tester2 delivered.
msg = readMsgChanTimeout(t, dt.committed, 5*time.Second)
testutils.CheckMsg(t, msg, "tester@example.com", []string{"tester2@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester2@example.org"}, encID+"-3")
q.Close()
// No more retries should be scheduled.
@ -403,11 +407,11 @@ func TestQueueDelivery_PermanentRcptReject(t *testing.T) {
q := newTestQueue(t, &dt)
defer cleanQueue(t, q)
testutils.DoTestDelivery(t, q, "tester@example.org", []string{"tester1@example.org", "tester2@example.org"})
encID := testutils.DoTestDelivery(t, q, "tester@example.org", []string{"tester1@example.org", "tester2@example.org"})
// Committed, tester2@example.org succeeded.
msg := readMsgChanTimeout(t, dt.committed, 5*time.Second)
testutils.CheckMsg(t, msg, "tester@example.org", []string{"tester2@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.org", []string{"tester2@example.org"}, encID+"-1")
q.Close()
// No more retries should be scheduled.
@ -433,15 +437,15 @@ func TestQueueDelivery_TemporaryRcptReject(t *testing.T) {
// tester2 - ok
// Second attempt:
// tester1 - ok
testutils.DoTestDelivery(t, q, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"})
encID := testutils.DoTestDelivery(t, q, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"})
msg := readMsgChanTimeout(t, dt.committed, 5*time.Second)
// Unlike previous tests where unreliableTarget rejected recipients by partialError, here they are rejected
// by AddRcpt directly, so they are NOT saved by the target.
testutils.CheckMsg(t, msg, "tester@example.com", []string{"tester2@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester2@example.org"}, encID+"-1")
msg = readMsgChanTimeout(t, dt.committed, 5*time.Second)
testutils.CheckMsg(t, msg, "tester@example.com", []string{"tester1@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester1@example.org"}, encID+"-2")
q.Close()
// No more retries should be scheduled.
@ -474,7 +478,7 @@ func TestQueueDelivery_SerializationRoundtrip(t *testing.T) {
// Standard partial delivery, retry will be scheduled for tester1@example.org.
msg := readMsgChanTimeout(t, dt.committed, 5*time.Second)
testutils.CheckMsg(t, msg, "tester@example.com", []string{"tester2@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester2@example.org"}, deliveryID+"-1")
// Then stop it.
q.Close()
@ -487,7 +491,7 @@ func TestQueueDelivery_SerializationRoundtrip(t *testing.T) {
// Wait for retry and check it.
msg = readMsgChanTimeout(t, dt.committed, 5*time.Second)
testutils.CheckMsg(t, msg, "tester@example.com", []string{"tester1@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester1@example.org"}, deliveryID+"-2")
// Close it again.
q.Close()
@ -522,7 +526,7 @@ func TestQueueDelivery_DeserlizationCleanUp(t *testing.T) {
// Standard partial delivery, retry will be scheduled for tester1@example.org.
msg := readMsgChanTimeout(t, dt.committed, 5*time.Second)
testutils.CheckMsg(t, msg, "tester@example.com", []string{"tester2@example.org"})
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester2@example.org"}, deliveryID+"-1")
q.Close()