Add requirements file, remove obsolete response code and update tests

Author: bigbes

.travis.yml

@@ -19,5 +19,6 @@ before_script:
   - sudo apt-get update
 
 script:
-  - sudo apt-get -y install tarantool python-yaml msgpack-python
+  - sudo apt-get -y install tarantool
+  - pip install -r requirements.txt
   - python setup.py test

requirements.txt

@@ -0,0 +1,2 @@
+msgpack-python>=0.4.0
+pyyaml>=3.10

tarantool/response.py

@@ -82,8 +82,6 @@ def completion_status(self):
         There are only three completion status codes in use:
             * ``0`` -- "success"; the only possible :attr:`return_code` with
                        this status is ``0``
-            * ``1`` -- "try again"; an indicator of an intermittent error.
-                       This status is handled automatically by this module.
             * ``2`` -- "error"; in this case :attr:`return_code` holds
                        the actual error.
         '''

tests/suites/test_dml.py

@@ -24,7 +24,7 @@ def setUpClass(self):
     def test_00_00_authenticate(self):
         self.assertIsNone(self.srv.admin("box.schema.user.create('test', { password = 'test' })"))
         self.assertIsNone(self.srv.admin("box.schema.user.grant('test', 'execute,read,write', 'universe')"))
-        self.assertEqual(self.con.authenticate('test', 'test'), [])
+        self.assertEqual(self.con.authenticate('test', 'test')._data, None)
 
     def test_00_01_space_created(self):
         # Check that space is created in setUpClass
@@ -35,23 +35,22 @@ def test_00_02_fill_space(self):
         for i in xrange(1, 500):
             self.assertEqual(
                     self.con.insert('space_1', [i, i%5, 'tuple_'+str(i)])[0],
-                    (i, i%5, 'tuple_'+str(i))
+                    [i, i%5, 'tuple_'+str(i)]
             )
     def test_00_03_answer_repr(self):
         repr_str = \
-'''---
-- [1, 1, 'tuple_1']
-...'''
+'''- [1, 1, tuple_1]
+'''
         self.assertEqual(repr(self.con.select('space_1', 1)), repr_str)
 
     def test_02_select(self):
         # Check that select with different keys are Ok. (With and without index names)
-        self.assertEqual(self.con.select('space_1', 20), [(20, 0, 'tuple_20')])
-        self.assertEqual(self.con.select('space_1', [21]), [(21, 1, 'tuple_21')])
-        self.assertEqual(self.con.select('space_1', [22], index='primary'), [(22, 2, 'tuple_22')])
-        self.assertEqual(self.con.select('space_1', [23], index='primary'), [(23, 3, 'tuple_23')])
+        self.assertEqual(self.con.select('space_1', 20), [[20, 0, 'tuple_20']])
+        self.assertEqual(self.con.select('space_1', [21]), [[21, 1, 'tuple_21']])
+        self.assertEqual(self.con.select('space_1', [22], index='primary'), [[22, 2, 'tuple_22']])
+        self.assertEqual(self.con.select('space_1', [23], index='primary'), [[23, 3, 'tuple_23']])
         # Check that Offset and Limit args are working fine.
-        self.assertEqual(self.con.select('space_1', [20], index='primary', limit=1), [(20, 0, 'tuple_20')])
+        self.assertEqual(self.con.select('space_1', [20], index='primary', limit=1), [[20, 0, 'tuple_20']])
         # With other indexes too
         self.assertEqual(
                 sorted(
@@ -63,14 +62,14 @@ def test_02_select(self):
                 sorted(
                     self.con.select('space_1', [0], index='secondary', offset=3, limit=1),
                     key = lambda x: x[0]),
-                [(110, 0, 'tuple_110')]
+                [[110, 0, 'tuple_110']]
             )
         self.assertEqual(
                 sorted(
                     self.con.select('space_1', [0], index='secondary', offset=3, limit=2),
                     key = lambda x: x[0]),
-                [(110, 0, 'tuple_110'),\
-                (115, 0, 'tuple_115')]
+                [[110, 0, 'tuple_110'],\
+                [115, 0, 'tuple_115']]
             )
 
         select_req = self.con.select('space_1', [0], index='secondary')
@@ -90,23 +89,23 @@ def test_02_select(self):
 
     def test_03_delete(self):
         # Check that delete works fine
-        self.assertEqual(self.con.delete('space_1', 20), [(20, 0, 'tuple_20')])
+        self.assertEqual(self.con.delete('space_1', 20), [[20, 0, 'tuple_20']])
         self.assertEqual(self.con.delete('space_1', [20]), [])
         self.assertEqual(self.con.select('space_1', [20], index='primary'), [])
         # Check that <index_id> field has no meaning, yet.
         with self.assertRaisesRegexp(tarantool.DatabaseError,
                 '(19, .*)'):
                 self.con.delete('space_1', [1, 'tuple_21'])
-        self.assertEqual(self.con.select('space_1', [21], index='primary'), [(21, 1, 'tuple_21')])
+        self.assertEqual(self.con.select('space_1', [21], index='primary'), [[21, 1, 'tuple_21']])
 
     def test_04_replace(self):
         # Check replace that is Ok.
-        self.assertEqual(self.con.replace('space_1', [2, 2, 'tuple_3']), [(2, 2, 'tuple_3')])
-        self.assertEqual(self.con.select('space_1', 2), [(2, 2, 'tuple_3')])
+        self.assertEqual(self.con.replace('space_1', [2, 2, 'tuple_3']), [[2, 2, 'tuple_3']])
+        self.assertEqual(self.con.select('space_1', 2), [[2, 2, 'tuple_3']])
         # Check replace that isn't Ok.
         with self.assertRaisesRegexp(tarantool.DatabaseError,
                 '(39, .*)'):
-            self.assertEqual(self.con.replace('space_1', [2, 2]), [(2, 2, 'tuple_2')])
+            self.assertEqual(self.con.replace('space_1', [2, 2]), [[2, 2, 'tuple_2']])
 
     def test_05_ping(self):
         # Simple ping test
@@ -117,22 +116,22 @@ def test_05_ping(self):
 
     def test_06_update(self):
         self.assertEqual(self.con.update('space_1', (2,), [('+', 1, 3)]),
-                [(2, 5, 'tuple_3')])
+                [[2, 5, 'tuple_3']])
         self.assertEqual(self.con.update('space_1', (2,), [('-', 1, 3)]),
-                [(2, 2, 'tuple_3')])
+                [[2, 2, 'tuple_3']])
         self.assertEqual(self.con.update('space_1', (2,), [(':', 2, 3, 2, 'lalal')]),
-                [(2, 2, 'tuplalal_3')])
+                [[2, 2, 'tuplalal_3']])
         self.assertEqual(self.con.update('space_1', (2,), [('!', 2, '1')]),
-                [(2, 2, '1', 'tuplalal_3')])
+                [[2, 2, '1', 'tuplalal_3']])
         self.assertEqual(self.con.update('space_1', (2,), [('!', 2, 'oingo, boingo')]),
-                [(2, 2, 'oingo, boingo', '1', 'tuplalal_3')])
+                [[2, 2, 'oingo, boingo', '1', 'tuplalal_3']])
         self.assertEqual(self.con.update('space_1', (2,), [('#', 2, 2)]),
-                [(2, 2, 'tuplalal_3')])
+                [[2, 2, 'tuplalal_3']])
 
     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)])
+        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, .*)'):
             self.con.call('json.decode')
@@ -159,8 +158,8 @@ def test_07_call(self):
 #                '(12345, \'lol, error\')'):
 #            self.con.call('box.error', [12345, 'lol, error'])
 
-        self.assertEqual(self.con.call('box.tuple.new', [1, 2, 3, 'fld_1']), [(1, 2, 3, 'fld_1')])
-        self.assertEqual(self.con.call('box.tuple.new', 'fld_1'), [('fld_1',)])
+        self.assertEqual(self.con.call('box.tuple.new', [1, 2, 3, 'fld_1']), [[1, 2, 3, 'fld_1']])
+        self.assertEqual(self.con.call('box.tuple.new', 'fld_1'), [['fld_1']])
 
     @classmethod
     def tearDownClass(self):

tests/suites/test_schema.py

@@ -19,7 +19,7 @@ def test_00_authenticate(self):
         self.assertIsNone(self.srv.admin("box.schema.user.create('test', { password = 'test' })"))
         self.assertIsNone(self.srv.admin("box.schema.user.grant('test', 'read,write', 'space', '_space')"))
         self.assertIsNone(self.srv.admin("box.schema.user.grant('test', 'read,write', 'space', '_index')"))
-        self.assertEqual(self.con.authenticate('test', 'test'), [])
+        self.assertEqual(self.con.authenticate('test', 'test')._data, None)
 
     def test_01_space_bad(self):
         with self.assertRaisesRegexp(tarantool.SchemaError,