tests/smtp.py
branchdevel
changeset 218 91f87ad13540
parent 186 b381eaa774ab
--- a/tests/smtp.py	Mon Mar 05 23:51:56 2012 +0100
+++ b/tests/smtp.py	Mon Mar 05 23:52:29 2012 +0100
@@ -40,7 +40,7 @@
     def testSendMail(self):
         p=self.getSMTP()
         content = "sadfadfgwertsdgsdf\n\nsdfgaerasdfsad\nadfasdf"
-        p.send(Mail("sub", content, None), "t@t.de")
+        p.send("t@t.de", Mail("sub", content, None))
 
 
         self.assertEqual(len(self.smtp_server.rcvd), 1)
@@ -57,7 +57,7 @@
     def testSendMailExtraFrm(self):
         p=self.getSMTP()
         content = ""
-        p.send(Mail("sub", content, "f@t.de"), "t@t.de")
+        p.send("t@t.de", Mail("sub", content, "f@t.de"))
 
         self.assertEqual(len(self.smtp_server.rcvd), 1)
         fromaddr, toaddrs, message = self.smtp_server.rcvd[0]
@@ -69,7 +69,7 @@
     def testSendMailException(self):
         p=self.getSMTP({"port":PORT-1})
         content = ""
-        self.assertRaises(IOError, p.send, Mail("sub", content, "f@t.de"), "t@t.de")
+        self.assertRaises(IOError, p.send, "t@t.de", Mail("sub", content, "f@t.de"))
 
         self.assertEqual(len(self.smtp_server.rcvd), 0)
 
@@ -81,7 +81,7 @@
 
         p=self.getSMTP({"SSL":True})
         content = "sadfadfgwertsdgsdf\n\nsdfgaerasdfsad\nadfasdf"
-        p.send(Mail("sub", content, None), "t@t.de")
+        p.send("t@t.de", Mail("sub", content, None))
 
         self.assertEqual(mock_ssl.call_count,1)
 
@@ -94,7 +94,7 @@
 
         p=self.getSMTP({"TLS":True})
         content = "sadfadfgwertsdgsdf\n\nsdfgaerasdfsad\nadfasdf"
-        p.send(Mail("sub", content, None), "t@t.de")
+        p.send("t@t.de", Mail("sub", content, None))
         
         mock_s.starttls.assert_called_once_with()
         self.assertEqual(mock_s.sendmail.call_count,1)
@@ -107,7 +107,7 @@
 
         p=self.getSMTP({"user":"user","password":"pw"})
         content = "sadfadfgwertsdgsdf\n\nsdfgaerasdfsad\nadfasdf"
-        p.send(Mail("sub", content, None), "t@t.de")
+        p.send("t@t.de", Mail("sub", content, None))
         
         mock_s.login.assert_called_once_with("user","pw")
         self.assertEqual(mock_s.sendmail.call_count,1)