mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-23 22:10:55 +01:00
Add unit tests for mail failover behaviors when multiple mailers are configured
Summary: Depends on D19006. Ref T13053. Ref T12677. When multiple mailers are configured but one or more fail, test that we recover (or don't) appropriately. Test Plan: Ran unit tests. Reviewers: amckinley Reviewed By: amckinley Maniphest Tasks: T13053, T12677 Differential Revision: https://secure.phabricator.com/D19007
This commit is contained in:
parent
9947eee182
commit
1f53aa27e4
2 changed files with 88 additions and 6 deletions
|
@ -315,6 +315,10 @@ final class PhabricatorMetaMTAMail
|
|||
return $this->getParam('stampMetadata', array());
|
||||
}
|
||||
|
||||
public function getMailerKey() {
|
||||
return $this->getParam('mailer.key');
|
||||
}
|
||||
|
||||
public function setHTMLBody($html) {
|
||||
$this->setParam('html-body', $html);
|
||||
return $this;
|
||||
|
@ -588,6 +592,12 @@ final class PhabricatorMetaMTAMail
|
|||
continue;
|
||||
}
|
||||
|
||||
// Keep track of which mailer actually ended up accepting the message.
|
||||
$mailer_key = $mailer->getKey();
|
||||
if ($mailer_key !== null) {
|
||||
$this->setParam('mailer.key', $mailer_key);
|
||||
}
|
||||
|
||||
return $this
|
||||
->setStatus(PhabricatorMailOutboundStatus::STATUS_SENT)
|
||||
->save();
|
||||
|
@ -919,12 +929,6 @@ final class PhabricatorMetaMTAMail
|
|||
$mailer->addCCs($add_cc);
|
||||
}
|
||||
|
||||
// Keep track of which mailer actually ended up accepting the message.
|
||||
$mailer_key = $mailer->getKey();
|
||||
if ($mailer_key !== null) {
|
||||
$this->setParam('mailer.key', $mailer_key);
|
||||
}
|
||||
|
||||
return $mailer;
|
||||
}
|
||||
|
||||
|
|
|
@ -253,4 +253,82 @@ final class PhabricatorMetaMTAMailTestCase extends PhabricatorTestCase {
|
|||
->executeOne();
|
||||
}
|
||||
|
||||
public function testMailerFailover() {
|
||||
$user = $this->generateNewTestUser();
|
||||
$phid = $user->getPHID();
|
||||
|
||||
$status_sent = PhabricatorMailOutboundStatus::STATUS_SENT;
|
||||
$status_queue = PhabricatorMailOutboundStatus::STATUS_QUEUE;
|
||||
$status_fail = PhabricatorMailOutboundStatus::STATUS_FAIL;
|
||||
|
||||
$mailer1 = id(new PhabricatorMailImplementationTestAdapter())
|
||||
->setKey('mailer1');
|
||||
|
||||
$mailer2 = id(new PhabricatorMailImplementationTestAdapter())
|
||||
->setKey('mailer2');
|
||||
|
||||
$mailers = array(
|
||||
$mailer1,
|
||||
$mailer2,
|
||||
);
|
||||
|
||||
// Send mail with both mailers active. The first mailer should be used.
|
||||
$mail = id(new PhabricatorMetaMTAMail())
|
||||
->addTos(array($phid))
|
||||
->sendWithMailers($mailers);
|
||||
$this->assertEqual($status_sent, $mail->getStatus());
|
||||
$this->assertEqual('mailer1', $mail->getMailerKey());
|
||||
|
||||
|
||||
// If the first mailer fails, the mail should be sent with the second
|
||||
// mailer. Since we transmitted the mail, this doesn't raise an exception.
|
||||
$mailer1->setFailTemporarily(true);
|
||||
|
||||
$mail = id(new PhabricatorMetaMTAMail())
|
||||
->addTos(array($phid))
|
||||
->sendWithMailers($mailers);
|
||||
$this->assertEqual($status_sent, $mail->getStatus());
|
||||
$this->assertEqual('mailer2', $mail->getMailerKey());
|
||||
|
||||
|
||||
// If both mailers fail, the mail should remain in queue.
|
||||
$mailer2->setFailTemporarily(true);
|
||||
|
||||
$mail = id(new PhabricatorMetaMTAMail())
|
||||
->addTos(array($phid));
|
||||
|
||||
$caught = null;
|
||||
try {
|
||||
$mail->sendWithMailers($mailers);
|
||||
} catch (Exception $ex) {
|
||||
$caught = $ex;
|
||||
}
|
||||
|
||||
$this->assertTrue($caught instanceof Exception);
|
||||
$this->assertEqual($status_queue, $mail->getStatus());
|
||||
$this->assertEqual(null, $mail->getMailerKey());
|
||||
|
||||
$mailer1->setFailTemporarily(false);
|
||||
$mailer2->setFailTemporarily(false);
|
||||
|
||||
|
||||
// If the first mailer fails permanently, the mail should fail even though
|
||||
// the second mailer isn't configured to fail.
|
||||
$mailer1->setFailPermanently(true);
|
||||
|
||||
$mail = id(new PhabricatorMetaMTAMail())
|
||||
->addTos(array($phid));
|
||||
|
||||
$caught = null;
|
||||
try {
|
||||
$mail->sendWithMailers($mailers);
|
||||
} catch (Exception $ex) {
|
||||
$caught = $ex;
|
||||
}
|
||||
|
||||
$this->assertTrue($caught instanceof Exception);
|
||||
$this->assertEqual($status_fail, $mail->getStatus());
|
||||
$this->assertEqual(null, $mail->getMailerKey());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue