Update libev unit tests for python3

thobbs · thobbs · commit 222bc3403fe8 · 2014-05-20T14:52:56.000-05:00
diff --git a/tests/unit/io/test_libevreactor.py b/tests/unit/io/test_libevreactor.py
@@ -20,7 +20,8 @@
 import errno
 import os
 
-from six.moves import StringIO
+import six
+from six import BytesIO
 
 from socket import error as socket_error
 
@@ -57,28 +58,28 @@ def make_connection(self):
         return c
 
     def make_header_prefix(self, message_class, version=2, stream_id=0):
-        return ''.join(map(uint8_pack, [
+        return six.binary_type().join(map(uint8_pack, [
             0xff & (HEADER_DIRECTION_TO_CLIENT | version),
             0,  # flags (compression)
             stream_id,
             message_class.opcode  # opcode
         ]))
 
     def make_options_body(self):
-        options_buf = StringIO()
+        options_buf = BytesIO()
         write_stringmultimap(options_buf, {
             'CQL_VERSION': ['3.0.1'],
             'COMPRESSION': []
         })
         return options_buf.getvalue()
 
     def make_error_body(self, code, msg):
-        buf = StringIO()
+        buf = BytesIO()
         write_int(buf, code)
         write_string(buf, msg)
         return buf.getvalue()
 
-    def make_msg(self, header, body=""):
+    def make_msg(self, header, body=six.binary_type()):
         return header + uint32_pack(len(body)) + body
 
     def test_successful_connection(self, *args):
@@ -107,12 +108,12 @@ def test_egain_on_buffer_size(self, *args):
         # get a connection that's already fully started
         c = self.test_successful_connection()
 
-        header = '\x00\x00\x00\x00' + int32_pack(20000)
+        header = six.b('\x00\x00\x00\x00') + int32_pack(20000)
         responses = [
-            header + ('a' * (4096 - len(header))),
-            'a' * 4096,
+            header + (six.b('a') * (4096 - len(header))),
+            six.b('a') * 4096,
             socket_error(errno.EAGAIN),
-            'a' * 100,
+            six.b('a') * 100,
             socket_error(errno.EAGAIN)]
 
         def side_effect(*args):
@@ -240,13 +241,13 @@ def test_partial_header_read(self, *args):
         message = self.make_msg(header, options)
 
         # read in the first byte
-        c._socket.recv.return_value = message[0]
+        c._socket.recv.return_value = message[0:1]
         c.handle_read(None, 0)
-        self.assertEqual(c._iobuf.getvalue(), message[0])
+        self.assertEqual(c._iobuf.getvalue(), message[0:1])
 
         c._socket.recv.return_value = message[1:]
         c.handle_read(None, 0)
-        self.assertEqual("", c._iobuf.getvalue())
+        self.assertEqual(six.binary_type(), c._iobuf.getvalue())
 
         # let it write out a StartupMessage
         c.handle_write(None, 0)
@@ -273,7 +274,7 @@ def test_partial_message_read(self, *args):
         # ... then read in the rest
         c._socket.recv.return_value = message[9:]
         c.handle_read(None, 0)
-        self.assertEqual("", c._iobuf.getvalue())
+        self.assertEqual(six.binary_type(), c._iobuf.getvalue())
 
         # let it write out a StartupMessage
         c.handle_write(None, 0)
