--- a/tests/smtp.py Sun Feb 19 17:41:27 2012 +0100
+++ b/tests/smtp.py Sun Feb 19 17:44:44 2012 +0100
@@ -39,9 +39,8 @@
def testSendMail(self):
p=self.getSMTP()
content = "sadfadfgwertsdgsdf\n\nsdfgaerasdfsad\nadfasdf"
- status = p.send(Mail("sub", content, None), "t@t.de")
+ p.send(Mail("sub", content, None), "t@t.de")
- self.assertEqual(status.status, status.GOOD)
self.assertEqual(len(self.smtp_server.rcvd), 1)
fromaddr, toaddrs, message = self.smtp_server.rcvd[0]
@@ -57,9 +56,7 @@
def testSendMailExtraFrm(self):
p=self.getSMTP()
content = ""
- status = p.send(Mail("sub", content, "f@t.de"), "t@t.de")
-
- self.assertEqual(status.status, status.GOOD)
+ p.send(Mail("sub", content, "f@t.de"), "t@t.de")
self.assertEqual(len(self.smtp_server.rcvd), 1)
fromaddr, toaddrs, message = self.smtp_server.rcvd[0]
@@ -83,10 +80,9 @@
p=self.getSMTP({"SSL":True})
content = "sadfadfgwertsdgsdf\n\nsdfgaerasdfsad\nadfasdf"
- status = p.send(Mail("sub", content, None), "t@t.de")
+ p.send(Mail("sub", content, None), "t@t.de")
self.assertEqual(mock_ssl.call_count,1)
- self.assertEqual(status.status, status.GOOD)
self.assertEqual(len(self.smtp_server.rcvd), 1)
@@ -97,12 +93,11 @@
p=self.getSMTP({"TLS":True})
content = "sadfadfgwertsdgsdf\n\nsdfgaerasdfsad\nadfasdf"
- status = p.send(Mail("sub", content, None), "t@t.de")
+ p.send(Mail("sub", content, None), "t@t.de")
mock_s.starttls.assert_called_once_with()
self.assertEqual(mock_s.sendmail.call_count,1)
self.assertEqual([i[0] for i in mock_s.method_calls],["starttls","sendmail","quit"])
- self.assertEqual(status.status, status.GOOD)
@patch("smtplib.SMTP")
def testLoginSendMail(self,mock_smtp):
@@ -111,12 +106,11 @@
p=self.getSMTP({"user":"user","password":"pw"})
content = "sadfadfgwertsdgsdf\n\nsdfgaerasdfsad\nadfasdf"
- status = p.send(Mail("sub", content, None), "t@t.de")
+ p.send(Mail("sub", content, None), "t@t.de")
mock_s.login.assert_called_once_with("user","pw")
self.assertEqual(mock_s.sendmail.call_count,1)
self.assertEqual([i[0] for i in mock_s.method_calls],["login","sendmail","quit"])
- self.assertEqual(status.status, status.GOOD)
def testNeededOption(self):