diff -r e6af45edff5a -r 07ee5543751b tests/smtp.py
--- a/tests/smtp.py	Thu Feb 23 16:56:25 2012 +0100
+++ b/tests/smtp.py	Thu Feb 23 16:57:57 2012 +0100
@@ -8,7 +8,7 @@
 from mock import patch, Mock
 import smtplib
 
-from iro.error import NoRoute, NoTyp, NeededOption, UnknownOption
+from iro.error import NoRoute, NoTyp, NeededOption
 from iro.model.message import Mail
 from iro.offer.smtp import SMTP
 
@@ -27,8 +27,7 @@
         ret={"send_from":"send@t.de",
             "host":HOST,
             "port":PORT,
-            "user":"",
-            "password":"",
+            "typ":"smtp",
             }
 
         if c:
@@ -119,6 +118,7 @@
             "port":PORT,
             "user":"u",
             "password":"p",
+            "typ":"smtp",
             }
         s=SMTP("test",c.items())
         self.assertEqual(s.send_from, "send@t.de")
@@ -126,20 +126,17 @@
         self.assertEqual(s.port, PORT)
         self.assertEqual(s.user, "u")
         self.assertEqual(s.password, "p")
-        self.assertEqual(s.bSSL,False)
-        self.assertEqual(s.bTLS,False)
+        self.assertEqual(s.SSL,False)
+        self.assertEqual(s.TLS,False)
 
         c.update({"TLS":True, "SSL":True})
         s=SMTP("test", c.items())
-        self.assertEqual(s.bSSL,True)
-        self.assertEqual(s.bTLS,True)
+        self.assertEqual(s.SSL,True)
+        self.assertEqual(s.TLS,True)
         
         del c["host"]
         self.assertRaises(NeededOption,SMTP,"test",c.items())
 
-        c = {"unknown":""}
-        self.assertRaises(UnknownOption,SMTP,"test",c.items())
-
     def testSendFunc(self):
         s = self.getSMTP()
         self.assertEqual(s.getSendFunc("mail",None), s.send)