Changeset 1076

Timestamp:

09/16/07 00:30:24 (14 months ago)

Author:

wichert

Message:

100% test coverage for the server

Location:

trunk/pyrad/tests

Files:

• mock.py (modified) (2 diffs)
• testServer.py (modified) (6 diffs)

trunk/pyrad/tests/mock.py

@@ -105 +105 @@
 
 
-def MockClassMethod(klass, name):
+def MockClassMethod(klass, name, myfunc=None):
     def func(self, *args, **kwargs):
         if not hasattr(self, "called"):
@@ -114 +114 @@
         klass._originals={}
     klass._originals[name]=getattr(klass, name)
-    setattr(klass, name, func)
+    if myfunc is None:
+        setattr(klass, name, func)
+    else:
+        setattr(klass, name, myfunc)
         
 

trunk/pyrad/tests/testServer.py

@@ -2 +2 @@
 import socket
 import unittest
+from pyrad.packet import PacketError
 from pyrad.server import RemoteHost
 from pyrad.server import Server
-from pyrad.server import PacketError
+from pyrad.server import ServerPacketError
 from pyrad.tests.mock import MockFinished
 from pyrad.tests.mock import MockPoll
@@ -173 +174 @@
         try:
             self.server._HandleAuthPacket(self.packet)
-        except PacketError, e:
+        except ServerPacketError, e:
             self.failUnless("unknown host" in str(e))
         else:
@@ -183 +184 @@
         try:
             self.server._HandleAuthPacket(self.packet)
-        except PacketError, e:
+        except ServerPacketError, e:
             self.failUnless("port" in str(e))
         else:
@@ -216 +217 @@
         try:
             self.server._HandleAcctPacket(self.packet)
-        except PacketError, e:
+        except ServerPacketError, e:
             self.failUnless("unknown host" in str(e))
         else:
@@ -226 +227 @@
         try:
             self.server._HandleAcctPacket(self.packet)
-        except PacketError, e:
+        except ServerPacketError, e:
             self.failUnless("port" in str(e))
         else:
@@ -327 +328 @@
 
 
-    def testRunIgnoresPollWeirdness(self):
-
-        MockPoll.results=(0, select.POLLERR)
-
-
+    def testRunIgnoresPollErrors(self):
+        self.server.authfds=[MockFd()]
+        MockPoll.results=[(0, select.POLLERR)]
+        self.assertRaises(MockFinished, self.server.Run)
+
+
+    def testRunIgnoresServerPacketErrors(self):
+        def RaisePacketError(self, fd):
+            raise ServerPacketError
+        MockClassMethod(Server, "_ProcessInput", RaisePacketError)
+        self.server.authfds=fd=[MockFd()]
+        MockPoll.results=[(0, select.POLLIN)]
+        self.assertRaises(MockFinished, self.server.Run)
+
+
+    def testRunIgnoresPacketErrors(self):
+        def RaisePacketError(self, fd):
+            raise PacketError
+        MockClassMethod(Server, "_ProcessInput", RaisePacketError)
+        self.server.authfds=fd=[MockFd()]
+        MockPoll.results=[(0, select.POLLIN)]
+        self.assertRaises(MockFinished, self.server.Run)
+
+
+    def testRunRunsProcessInput(self):
+        MockClassMethod(Server, "_ProcessInput")
+        self.server.authfds=fd=[MockFd()]
+        MockPoll.results=[(0, select.POLLIN)]
+        self.assertRaises(MockFinished, self.server.Run)
+        self.assertEqual(self.server.called, [("_ProcessInput", (fd[0],), {})])