fix for tests ok

Author: shveenkov

tarantool/request.py

@@ -4,6 +4,7 @@
 Request types definitions
 '''
 
+import six
 import msgpack
 import hashlib
 
@@ -105,14 +106,17 @@ def __init__(self, conn, salt, user, password):
         super(RequestAuthenticate, self).__init__(conn)
 
         def sha1(values):
-            sha1 = hashlib.sha1()
+            sha = hashlib.sha1()
             for i in values:
-                sha1.update(i)
-            return sha1.digest()
+                sha.update(i if isinstance(i, six.binary_type) else i.encode())
+            return sha.digest()
 
         def strxor(rhs, lhs):
+            if six.PY2:
                 return "".join(chr(ord(x) ^ ord(y)) for x, y in zip(rhs, lhs))
 
+            return bytes([x ^ y for x, y in zip(rhs, lhs)])
+
         hash1 = sha1((password,))
         hash2 = sha1((hash1,))
         scramble = sha1((salt, hash2))

tarantool/response.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # pylint: disable=C0301,W0105,W0401,W0614
 
+import six
 import sys
 import msgpack
 import yaml
@@ -41,7 +42,11 @@ def __init__(self, conn, response):
         # created in the __new__(). But let it be.
         super(Response, self).__init__()
 
-        unpacker = msgpack.Unpacker(use_list=True)
+        if six.PY2:
+            unpacker = msgpack.Unpacker(use_list=True)
+        else:
+            unpacker = msgpack.Unpacker(use_list=True, encoding="utf-8")
+
         unpacker.feed(response)
         header = unpacker.unpack()
 

tarantool/schema.py

@@ -14,7 +14,7 @@
 class SchemaIndex(object):
     def __init__(self, array, space):
         self.iid = array[1]
-        self.name = array[2].decode()
+        self.name = array[2]
         self.index = array[3]
         self.unique = array[4]
         self.parts = []
@@ -35,7 +35,7 @@ class SchemaSpace(object):
     def __init__(self, array, schema):
         self.sid = array[0]
         self.arity = array[1]
-        self.name = array[2].decode()
+        self.name = array[2]
         self.indexes = {}
         self.schema = schema
         self.schema[self.sid] = self

tests/suites/lib/tarantool_server.py

@@ -1,4 +1,7 @@
+# -*- coding: utf-8 -*-
+
 import os
+import os.path
 import errno
 import shlex
 import random
@@ -39,6 +42,7 @@ def __init__(self, host, port):
         self.port = port
         self.is_connected = False
         self.socket = None
+
     def connect(self):
         self.socket = socket.create_connection((self.host, self.port))
         self.socket.setsockopt(socket.SOL_TCP, socket.TCP_NODELAY, 1)
@@ -87,7 +91,7 @@ def execute_no_reconnect(self, command):
         if not command:
             return
         cmd = command.replace('\n', ' ') + '\n'
-        self.socket.sendall(cmd)
+        self.socket.sendall(cmd.encode())
 
         bufsiz = 4096
         res = ""
@@ -96,7 +100,7 @@ def execute_no_reconnect(self, command):
             buf = self.socket.recv(bufsiz)
             if not buf:
                 break
-            res = res + buf
+            res = res + buf.decode()
             if (res.rfind("\n...\n") >= 0 or res.rfind("\r\n...\r\n") >= 0):
                 break
 
@@ -134,6 +138,7 @@ def script_dst(self):
     def script(self):
         if not hasattr(self, '_script'): self._script = None
         return self._script
+
     @script.setter
     def script(self, val):
         if val is None:
@@ -153,6 +158,7 @@ def _admin(self):
         if not hasattr(self, 'admin'):
             self.admin = None
         return self.admin
+
     @_admin.setter
     def _admin(self, port):
         try:
@@ -168,6 +174,7 @@ def log_des(self):
         if not hasattr(self, '_log_des'):
             self._log_des = open(self.logfile_path, 'a')
         return self._log_des
+
     @log_des.deleter
     def log_des(self):
         if not hasattr(self, '_log_des'):
@@ -249,15 +256,17 @@ def start(self):
         self.wait_until_started()
 
     def stop(self):
-        self.process.terminate()
-        self.process.wait()
+        if self.process.poll() is None:
+            self.process.terminate()
+            self.process.wait()
 
     def restart(self):
         self.stop()
         self.start()
 
     def clean(self):
-        shutil.rmtree(self.vardir)
+        if os.path.isdir(self.vardir):
+            shutil.rmtree(self.vardir)
 
     def __del__(self):
         self.stop()