test: assert admin commands success

Admin command are sent through text protocol. Responses are rarely
processed, especially those which sets up schema and users. But such
requests can contain errors, like "already exists" or syntax ones.
Having asserts on schema set up makes it easier to debug some cases.
For example, it was helpful in discovering the reason behind
"user not exists" fails fixed in "wait until server is ready" patchset
commit [1].

1. https://github.com/tarantool/tarantool-python/actions/runs/5784619729/job/15675655683?pr=306

Author: DifferentialOrange

test/suites/test_connection.py

@@ -5,15 +5,17 @@
 
 import sys
 import unittest
-
 import decimal
+
+import pkg_resources
 import msgpack
 
 import tarantool
 import tarantool.msgpack_ext.decimal as ext_decimal
 
 from .lib.skip import skip_or_run_decimal_test, skip_or_run_varbinary_test
 from .lib.tarantool_server import TarantoolServer
+from .utils import assert_admin_success
 
 
 class TestSuiteConnection(unittest.TestCase):
@@ -26,35 +28,45 @@ def setUpClass(cls):
         cls.srv.start()
 
         cls.adm = cls.srv.admin
-        cls.adm(r"""
+        resp = cls.adm("""
             box.schema.user.create('test', {password = 'test', if_not_exists = true})
             box.schema.user.grant('test', 'read,write,execute', 'universe')
 
-            box.schema.create_space('space_varbin')
-
-            box.space['space_varbin']:format({
-                {
-                    'id',
-                    type = 'number',
-                    is_nullable = false
-                },
-                {
-                    'varbin',
-                    type = 'varbinary',
-                    is_nullable = false,
-                }
-            })
-
-            box.space['space_varbin']:create_index('id', {
-                type = 'tree',
-                parts = {1, 'number'},
-                unique = true})
-
-            box.space['space_varbin']:create_index('varbin', {
-                type = 'tree',
-                parts = {2, 'varbinary'},
-                unique = true})
+            return true
         """)
+        assert_admin_success(resp)
+
+        if cls.srv.admin.tnt_version >= pkg_resources.parse_version('2.2.1'):
+            resp = cls.adm("""
+                box.schema.create_space('space_varbin')
+
+                box.space['space_varbin']:format({
+                    {
+                        'id',
+                        type = 'number',
+                        is_nullable = false
+                    },
+                    {
+                        'varbin',
+                        type = 'varbinary',
+                        is_nullable = false,
+                    }
+                })
+
+                box.space['space_varbin']:create_index('id', {
+                    type = 'tree',
+                    parts = {1, 'number'},
+                    unique = true})
+
+                box.space['space_varbin']:create_index('varbin', {
+                    type = 'tree',
+                    parts = {2, 'varbinary'},
+                    unique = true})
+
+                return true
+            """)
+            assert_admin_success(resp)
+
         cls.con = None
 
     def setUp(self):

test/suites/test_datetime.py

@@ -16,6 +16,7 @@
 
 from .lib.tarantool_server import TarantoolServer
 from .lib.skip import skip_or_run_datetime_test, skip_or_run_datetime_2_11_test
+from .utils import assert_admin_success
 
 
 class TestSuiteDatetime(unittest.TestCase):
@@ -28,7 +29,7 @@ def setUpClass(cls):
         cls.srv.start()
 
         cls.adm = cls.srv.admin
-        cls.adm(r"""
+        resp = cls.adm("""
             _, datetime = pcall(require, 'datetime')
 
             box.schema.space.create('test')
@@ -57,7 +58,10 @@ def setUpClass(cls):
                 return arg1 - arg2
             end
             rawset(_G, 'sub', sub)
+
+            return true
         """)
+        assert_admin_success(resp)
 
         cls.con = tarantool.Connection(cls.srv.host, cls.srv.args['primary'],
                                        user='test', password='test')
@@ -67,7 +71,11 @@ def setUp(self):
         if self.srv.is_started():
             self.srv.touch_lock()
 
-        self.adm("box.space['test']:truncate()")
+        resp = self.adm("""
+            box.space['test']:truncate()
+            return true
+        """)
+        assert_admin_success(resp)
 
     def test_datetime_class_api(self):
         datetime = tarantool.Datetime(year=2022, month=8, day=31, hour=18, minute=7, sec=54,

test/suites/test_dbapi.py

@@ -12,6 +12,7 @@
 from tarantool import dbapi
 from .lib.tarantool_server import TarantoolServer
 from .lib.skip import skip_or_run_sql_test
+from .utils import assert_admin_success
 
 
 class TestSuiteDBAPI(dbapi20.DatabaseAPI20Test):
@@ -39,17 +40,20 @@ def setUpClass(cls):
             "port": cls.srv.args['primary']
         }
 
+        # grant full access to guest
+        resp = cls.srv.admin("""
+            box.schema.user.grant('guest', 'create,read,write,execute', 'universe')
+            return true
+        """)
+        assert_admin_success(resp)
+
     @skip_or_run_sql_test
     def setUp(self):
         # prevent a remote tarantool from clean our session
         if self.srv.is_started():
             self.srv.touch_lock()
         self.con.flush_schema()
 
-        # grant full access to guest
-        self.srv.admin("box.schema.user.grant('guest', 'create,read,write,"
-                       "execute', 'universe')")
-
     @classmethod
     def tearDownClass(cls):
         cls.con.close()

test/suites/test_decimal.py

@@ -16,6 +16,7 @@
 
 from .lib.tarantool_server import TarantoolServer
 from .lib.skip import skip_or_run_decimal_test
+from .utils import assert_admin_success
 
 
 class TestSuiteDecimal(unittest.TestCase):
@@ -28,7 +29,7 @@ def setUpClass(cls):
         cls.srv.start()
 
         cls.adm = cls.srv.admin
-        cls.adm(r"""
+        resp = cls.adm("""
             _, decimal = pcall(require, 'decimal')
 
             box.schema.space.create('test')
@@ -47,7 +48,10 @@ def setUpClass(cls):
 
             box.schema.user.create('test', {password = 'test', if_not_exists = true})
             box.schema.user.grant('test', 'read,write,execute', 'universe')
+
+            return true
         """)
+        assert_admin_success(resp)
 
         cls.con = tarantool.Connection(cls.srv.host, cls.srv.args['primary'],
                                        user='test', password='test')
@@ -57,7 +61,11 @@ def setUp(self):
         if self.srv.is_started():
             self.srv.touch_lock()
 
-        self.adm("box.space['test']:truncate()")
+        resp = self.adm("""
+            box.space['test']:truncate()
+            return true
+        """)
+        assert_admin_success(resp)
 
     valid_cases = {
         'simple_decimal_1': {

test/suites/test_dml.py

@@ -10,6 +10,7 @@
 
 from .lib.tarantool_server import TarantoolServer
 from .lib.skip import skip_or_run_error_extra_info_test
+from .utils import assert_admin_success
 
 
 class TestSuiteRequest(unittest.TestCase):
@@ -23,28 +24,31 @@ def setUpClass(cls):
         cls.con = tarantool.Connection(cls.srv.host, cls.srv.args['primary'])
         cls.adm = cls.srv.admin
         cls.space_created = cls.adm("box.schema.create_space('space_1')")
-        cls.adm("""
-        box.space['space_1']:create_index('primary', {
-            type = 'tree',
-            parts = {1, 'num'},
-            unique = true})
-        """.replace('\n', ' '))
-        cls.adm("""
-        box.space['space_1']:create_index('secondary', {
-            type = 'tree',
-            parts = {2, 'num', 3, 'str'},
-            unique = false})
-        """.replace('\n', ' '))
-        cls.space_created = cls.adm("box.schema.create_space('space_2')")
-        cls.adm("""
-        box.space['space_2']:create_index('primary', {
-            type = 'hash',
-            parts = {1, 'num'},
-            unique = true})
-        """.replace('\n', ' '))
-        cls.adm("json = require('json')")
-        cls.adm("fiber = require('fiber')")
-        cls.adm("uuid = require('uuid')")
+        resp = cls.adm("""
+            box.space['space_1']:create_index('primary', {
+                type = 'tree',
+                parts = {1, 'num'},
+                unique = true})
+
+            box.space['space_1']:create_index('secondary', {
+                type = 'tree',
+                parts = {2, 'num', 3, 'str'},
+                unique = false})
+
+            box.schema.create_space('space_2')
+
+            box.space['space_2']:create_index('primary', {
+                type = 'hash',
+                parts = {1, 'num'},
+                unique = true})
+
+            json = require('json')
+            fiber = require('fiber')
+            uuid = require('uuid')
+
+            return true
+        """)
+        assert_admin_success(resp)
 
         if not sys.platform.startswith("win"):
             cls.sock_srv = TarantoolServer(create_unix_socket=True)
@@ -311,7 +315,7 @@ def test_11_select_all_hash(self):
             space.select((), iterator=tarantool.const.ITERATOR_EQ)
 
     def test_12_update_fields(self):
-        self.srv.admin(
+        resp = self.srv.admin(
             """
             do
                 local sp = box.schema.create_space('sp', {
@@ -325,7 +329,9 @@ def test_12_update_fields(self):
                     parts = {1, 'unsigned'}
                 })
             end
+            return true
             """)
+        assert_admin_success(resp)
         self.con.insert('sp', [2, 'help', 4])
         self.assertSequenceEqual(
             self.con.update('sp', (2,), [('+', 'thi', 3)]),

test/suites/test_encoding.py

@@ -1,16 +1,18 @@
 """
 This module tests various type encoding cases.
 """
-# pylint: disable=missing-class-docstring,missing-function-docstring
+# pylint: disable=missing-class-docstring,missing-function-docstring,duplicate-code
 
 import sys
 import unittest
+import pkg_resources
 
 import tarantool
 from tarantool.error import DatabaseError
 
 from .lib.skip import skip_or_run_varbinary_test, skip_or_run_error_extra_info_test
 from .lib.tarantool_server import TarantoolServer
+from .utils import assert_admin_success
 
 
 class TestSuiteEncoding(unittest.TestCase):
@@ -24,52 +26,58 @@ def setUpClass(cls):
         cls.srv.script = 'test/suites/box.lua'
         cls.srv.start()
 
-        cls.srv.admin("""
+        resp = cls.srv.admin("""
             box.schema.user.create('test', { password = 'test' })
             box.schema.user.grant('test', 'execute,read,write', 'universe')
+
+            return true
         """)
+        assert_admin_success(resp)
 
         args = [cls.srv.host, cls.srv.args['primary']]
         kwargs = {'user': 'test', 'password': 'test'}
         cls.con_encoding_utf8 = tarantool.Connection(*args, encoding='utf-8', **kwargs)
         cls.con_encoding_none = tarantool.Connection(*args, encoding=None, **kwargs)
         cls.conns = [cls.con_encoding_utf8, cls.con_encoding_none]
 
-        cls.srv.admin("box.schema.create_space('space_str')")
-        cls.srv.admin("""
+        resp = cls.srv.admin("""
+            box.schema.create_space('space_str')
             box.space['space_str']:create_index('primary', {
                 type = 'tree',
                 parts = {1, 'str'},
                 unique = true})
-        """.replace('\n', ' '))
-
-        cls.srv.admin("box.schema.create_space('space_varbin')")
-        cls.srv.admin(r"""
-            box.space['space_varbin']:format({
-                {
-                    'id',
-                    type = 'number',
-                    is_nullable = false
-                },
-                {
-                    'varbin',
-                    type = 'varbinary',
-                    is_nullable = false,
-                }
-            })
-        """.replace('\n', ' '))
-        cls.srv.admin("""
-            box.space['space_varbin']:create_index('id', {
-                type = 'tree',
-                parts = {1, 'number'},
-                unique = true})
-        """.replace('\n', ' '))
-        cls.srv.admin("""
-            box.space['space_varbin']:create_index('varbin', {
-                type = 'tree',
-                parts = {2, 'varbinary'},
-                unique = true})
-        """.replace('\n', ' '))
+
+            return true
+        """)
+        assert_admin_success(resp)
+
+        if cls.srv.admin.tnt_version >= pkg_resources.parse_version('2.2.1'):
+            resp = cls.srv.admin("""
+                box.schema.create_space('space_varbin')
+                box.space['space_varbin']:format({
+                    {
+                        'id',
+                        type = 'number',
+                        is_nullable = false
+                    },
+                    {
+                        'varbin',
+                        type = 'varbinary',
+                        is_nullable = false,
+                    }
+                })
+                box.space['space_varbin']:create_index('id', {
+                    type = 'tree',
+                    parts = {1, 'number'},
+                    unique = true})
+                box.space['space_varbin']:create_index('varbin', {
+                    type = 'tree',
+                    parts = {2, 'varbinary'},
+                    unique = true})
+
+                    return true
+            """)
+            assert_admin_success(resp)
 
     def assertNotRaises(self, func, *args, **kwargs):
         try: