updated to match new internal manager usage. needs more work and mock poller

Lawouach · Lawouach · commit f7ae53805992 · 2013-02-05T23:20:40.000+01:00
diff --git a/test/test_cherrypy.py b/test/test_cherrypy.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
+import time
 import unittest
 
 import cherrypy
 from ws4py.server.cherrypyserver import WebSocketPlugin, WebSocketTool
 from ws4py.websocket import EchoWebSocket
-from ws4py.compat import py3k
 
 class FakeSocket(object):
     def settimeout(self, timeout):
@@ -28,6 +28,12 @@ def fileno(self):
     def recv(self, bufsize=0):
         pass
 
+    def getsockname(self):
+        return '127.0.0.1', 0
+
+    def getpeername(self):
+        return '127.0.0.1', 8091
+
 class App(object):
     @cherrypy.expose
     def ws(self):
@@ -60,24 +66,20 @@ def tearDown(self):
         teardown_engine()
 
     def test_plugin(self):
-        self.assertEquals(len(cherrypy.engine.websocket.pool), 0)
+        manager = cherrypy.engine.websocket.manager
+        self.assertEquals(len(manager), 0)
 
         s = FakeSocket()
         h = EchoWebSocket(s, [], [])
         cherrypy.engine.publish('handle-websocket', h, ('127.0.0.1', 0))
-        self.assertEquals(len(cherrypy.engine.websocket.pool), 1)
-        if py3k:
-            k = list(cherrypy.engine.websocket.pool.keys())[0]
-        else:
-            k = cherrypy.engine.websocket.pool.keys()[0]
-        self.assertTrue(k is h)
-        self.assertEquals(cherrypy.engine.websocket.pool[k][1], ('127.0.0.1', 0))
-
-        self.assertEquals(len(cherrypy.engine.websocket.pool), 1)
-        h.close() # shutdown server side of the websocket connection
+        self.assertEquals(len(manager), 1)
+        self.assertIn(h, manager)
+
+        h.close() # initiate closing handshake
         h.client_terminated = True # we aren't actually connected so pretend the client shutdown
-        cherrypy.engine.publish('main')
-        self.assertEquals(len(cherrypy.engine.websocket.pool), 0)
+
+        # TODO: Implement a fake poller so that works...
+        self.assertEquals(len(manager), 0)
 
 if __name__ == '__main__':
     suite = unittest.TestSuite()
