Fix python3 tests and compatibility

Author: bigbes

tarantool/schema.py

@@ -22,7 +22,7 @@ def __init__(self, index_row, space):
         self.parts = []
         if isinstance(index_row[5], (list, tuple)):
             for k, v in index_row[5]:
-                self.parts.append(k, v)
+                self.parts.append((k, v))
         else:
             for i in range(index_row[5]):
                 self.parts.append((index_row[5 + 1 + i * 2], index_row[5 + 2 + i * 2]))
@@ -100,13 +100,13 @@ def get_index(self, space, index):
 
         index_row = None
         try:
-            index_row = self.con.select(const.SPACE_VSPACE, [_space.sid, index],
+            index_row = self.con.select(const.SPACE_VINDEX, [_space.sid, index],
                                 index=_index)
         except DatabaseError as e:
             if e.args[0] != 36:
                 raise
         if index_row is None:
-            index_row = self.con.select(const.SPACE_SPACE, [_space.sid, index],
+            index_row = self.con.select(const.SPACE_INDEX, [_space.sid, index],
                                 index=_index)
 
         if len(index_row) > 1:

tarantool/utils.py

@@ -37,7 +37,7 @@ class Greeting:
     # Tarantool 1.6.8-132-g82f5424 (Lua console)
     result = Greeting()
     try:
-        (product, _, tail) = greeting_buf[0:63].partition(' ')
+        (product, _, tail) = str(greeting_buf)[0:63].partition(' ')
         if product.startswith("Tarantool "):
             raise Exception()
         # Parse a version string - 1.6.6-83-gc6b2129 or 1.6.7
@@ -64,4 +64,4 @@ class Greeting:
         return result
     except Exception as e:
         print('exx', e)
-        raise ValueError("Invalid greeting: " + greeting_buf)
+        raise ValueError("Invalid greeting: " + str(greeting_buf))

tests/suites/__init__.py

@@ -4,17 +4,18 @@
 __tmp = os.getcwd()
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
-from test_schema import TestSuite_Schema
-from test_dml import Request
+from .test_schema import TestSuite_Schema
+from .test_dml import TestSuite_Request
+from .test_protocol import TestSuite_Protocol
 
-test_cases = (TestSuite_Schema, Request)
+test_cases = (TestSuite_Schema, TestSuite_Request, TestSuite_Protocol)
 
 def load_tests(loader, tests, pattern):
     suite = unittest.TestSuite()
     for testc in test_cases:
         suite.addTests(loader.loadTestsFromTestCase(testc))
     return suite
-    
+
 
 os.chdir(__tmp)
 

tests/suites/test_dml.py

@@ -4,9 +4,9 @@
 import yaml
 import unittest
 import tarantool
-from lib.tarantool_server import TarantoolServer
+from .lib.tarantool_server import TarantoolServer
 
-class Request(unittest.TestCase):
+class TestSuite_Request(unittest.TestCase):
     @classmethod
     def setUpClass(self):
         print(' DML '.center(70, '='))
@@ -134,12 +134,10 @@ def test_07_call(self):
         self.assertEqual(self.con.call('json.decode', '[123, 234, 345]'), [[123, 234, 345]])
         self.assertEqual(self.con.call('json.decode', ['[123, 234, 345]']), [[123, 234, 345]])
         self.assertEqual(self.con.call('json.decode', ('[123, 234, 345]',)), [[123, 234, 345]])
-        with self.assertRaisesRegexp(tarantool.DatabaseError,
-                '(32, .*)'):
+        with self.assertRaisesRegexp(tarantool.DatabaseError, '(32, .*)'):
             self.con.call('json.decode')
-        with self.assertRaisesRegexp(tarantool.DatabaseError,
-                '(22, .*)'):
-            self.con.call('json.decode', '{"hello": "world"}')
+        with self.assertRaisesRegexp(tarantool.DatabaseError, '(32, .*)'):
+            self.con.call('json.decode', '{[1, 2]: "world"}')
         ans = self.con.call('fiber.time')
         self.assertEqual(len(ans), 1)
         self.assertEqual(len(ans[0]), 1)

tests/suites/test_protocol.py

@@ -5,11 +5,15 @@
 import uuid
 
 class TestSuite_Protocol(unittest.TestCase):
+    @classmethod
+    def setUpClass(self):
+        print(' PROTOCOL '.center(70, '='))
+        print('-' * 70)
 
     def test_00_greeting_1_6(self):
         buf = "Tarantool 1.6.6                                                \n" + \
               "AtQnb9SAIaKazZZy9lJKvK3urtbjCEJndhRVbslSPGc=                   \n";
-        greeting = greeting_decode(buf)
+        greeting = greeting_decode(buf.encode())
         self.assertEqual(greeting.version_id, version_id(1, 6, 6))
         self.assertEqual(greeting.protocol, "Binary")
         self.assertIsNone(greeting.uuid)
@@ -18,7 +22,7 @@ def test_00_greeting_1_6(self):
     def test_01_greeting_1_6_with_tag(self):
         buf = "Tarantool 1.6.6-232-gcf47324                                   \n" + \
               "AtQnb9SAIaKazZZy9lJKvK3urtbjCEJndhRVbslSPGc=                   \n";
-        greeting = greeting_decode(buf)
+        greeting = greeting_decode(buf.encode())
         self.assertEqual(greeting.version_id, version_id(1, 6, 6))
         self.assertEqual(greeting.protocol, "Binary")
         self.assertIsNone(greeting.uuid)
@@ -27,7 +31,7 @@ def test_01_greeting_1_6_with_tag(self):
     def test_02_greeting_1_6_console(self):
         buf = "Tarantool 1.6.6-132-g82f5424 (Lua console)                     \n" + \
               "type 'help' for interactive help                               \n";
-        greeting = greeting_decode(buf)
+        greeting = greeting_decode(buf.encode())
         self.assertEqual(greeting.version_id, version_id(1, 6, 6))
         self.assertEqual(greeting.protocol, "Lua console")
         self.assertIsNone(greeting.uuid)
@@ -36,7 +40,7 @@ def test_02_greeting_1_6_console(self):
     def test_03_greeting_1_6_7(self):
         buf = "Tarantool 1.6.7 (Binary) 52dc2837-8001-48fe-bdce-c493c04599ce  \n" + \
               "Z+2F+VRlyK1nKT82xQtxqEggMtkTK5RtPYf27JryRas=                   \n";
-        greeting = greeting_decode(buf)
+        greeting = greeting_decode(buf.encode())
         self.assertEqual(greeting.version_id, version_id(1, 6, 7))
         self.assertEqual(greeting.protocol, "Binary")
         self.assertEqual(greeting.uuid,

tests/suites/test_schema.py

@@ -2,7 +2,7 @@
 
 import unittest
 import tarantool
-from lib.tarantool_server import TarantoolServer
+from .lib.tarantool_server import TarantoolServer
 
 class TestSuite_Schema(unittest.TestCase):
     @classmethod