whenever a frame is too large it is handled by an exception anyway

Lawouach · Lawouach · commit 3f27a164f177 · 2012-02-05T17:45:08.000+01:00
diff --git a/test/test_stream.py b/test/test_stream.py
@@ -9,13 +9,23 @@
 from ws4py.messaging import CloseControlMessage
 
 class WSStreamTest(unittest.TestCase):
-    def test_close_message_received(self):
+    def test_empty_close_message(self):
         f = Frame(opcode=OPCODE_CLOSE, body='', fin=1).build()
         s = Stream()
         self.assertEqual(s.closing, None)
         s.parser.send(f)
         self.assertEqual(type(s.closing), CloseControlMessage)
     
+    def test_too_large_close_message(self):
+        f = Frame(opcode=OPCODE_CLOSE, body='*' * 330, fin=1).build()
+        s = Stream()
+        self.assertEqual(s.closing, None)
+        s.parser.send(f)
+        self.assertEqual(s.closing, None)
+        self.assertEqual(len(s.errors), 1)
+        self.assertEqual(type(s.errors[0]), CloseControlMessage)
+        self.assertEqual(s.errors[0].code, 1002)
+    
     def test_ping_message_received(self):
         msg = 'ping me'
         f = Frame(opcode=OPCODE_PING, body=msg, fin=1).build()
diff --git a/ws4py/streaming.py b/ws4py/streaming.py
@@ -215,9 +215,9 @@ def receiver(self):
                     elif frame.opcode == OPCODE_CLOSE:
                         code = 1000
                         reason = ""
-                        if len(bytes) == 0:
+                        if frame.payload_length == 0:
                             self.closing = CloseControlMessage(code=1000)
-                        elif 1 < len(bytes) < 126:
+                        elif 1 < frame.payload_length < 126:
                             code = struct.unpack("!H", str(bytes[0:2]))[0]
                             try:
                                 code = int(code)
@@ -239,8 +239,6 @@ def receiver(self):
                                             code = 1007
                                             reason = ''                                
                             self.closing = CloseControlMessage(code=code, reason=reason)
-                        else:
-                            self.errors.append(CloseControlMessage(code=1002))
                         
                     elif frame.opcode == OPCODE_PING:
                         self.pings.append(PingControlMessage(bytes))
