Resolve comments

Author: ylobankov

test/suites/lib/skip.py

@@ -6,15 +6,22 @@
 
 
 def skip_or_run_sql_test(func):
-    """Decorator to skip or run SQL-related test depending on tarantool version.
+    """Decorator to skip or run SQL-related tests depending on the tarantool
+    version.
 
     Tarantool supports SQL-related stuff only since 2.0.0 version. So this
     decorator should wrap every SQL-related test to skip it if the tarantool
     version < 2.0.0 is used for testing.
+
+    Also, it can be used with the 'setUp' method for skipping the whole test
+    suite.
     """
 
     @functools.wraps(func)
     def wrapper(self, *args, **kwargs):
+        if func.__name__ == 'setUp':
+            func(self, *args, **kwargs)
+
         if not hasattr(self, 'tnt_version'):
             self.__class__.tnt_version = re.match(
                 r'[\d.]+', self.srv.admin('box.info.version')[0]
@@ -29,7 +36,8 @@ def wrapper(self, *args, **kwargs):
             self.skipTest(
                 'Tarantool %s does not support SQL' % self.tnt_version
             )
-        else:
+
+        if func.__name__ != 'setUp':
             func(self, *args, **kwargs)
 
     return wrapper

test/suites/test_dbapi.py

@@ -35,6 +35,7 @@ def setUpClass(self):
             host=self.srv.host,
             port=self.srv.args['primary'])
 
+    @skip_or_run_sql_test
     def setUp(self):
         # prevent a remote tarantool from clean our session
         if self.srv.is_started():
@@ -51,47 +52,6 @@ def tearDownClass(self):
         self.srv.stop()
         self.srv.clean()
 
-    @skip_or_run_sql_test
-    def test_None(self):
-        super(TestSuite_DBAPI, self).test_None()
-
-    @skip_or_run_sql_test
-    def test_cursor_isolation(self):
-        super(TestSuite_DBAPI, self).test_cursor_isolation()
-
-    @skip_or_run_sql_test
-    def test_execute(self):
-        super(TestSuite_DBAPI, self).test_execute()
-
-    @skip_or_run_sql_test
-    def test_executemany(self):
-        super(TestSuite_DBAPI, self).test_executemany()
-
-    @skip_or_run_sql_test
-    def test_fetchall(self):
-        super(TestSuite_DBAPI, self).test_fetchall()
-
-    @skip_or_run_sql_test
-    def test_fetchmany(self):
-        super(TestSuite_DBAPI, self).test_fetchmany()
-
-    @skip_or_run_sql_test
-    def test_fetchone(self):
-        super(TestSuite_DBAPI, self).test_fetchone()
-
-    @skip_or_run_sql_test
-    def test_mixedfetch(self):
-        super(TestSuite_DBAPI, self).test_mixedfetch()
-
-    @skip_or_run_sql_test
-    def test_setinputsizes(self):
-        super(TestSuite_DBAPI, self).test_setinputsizes()
-
-    @skip_or_run_sql_test
-    def test_setoutputsize_basic(self):
-        super(TestSuite_DBAPI, self).test_setoutputsize_basic()
-
-    @skip_or_run_sql_test
     def test_rowcount(self):
         con = self._connect()
         try:

test/suites/test_execute.py

@@ -31,6 +31,7 @@ def setUpClass(self):
         self.srv.start()
         self.con = tarantool.Connection(self.srv.host, self.srv.args['primary'])
 
+    @skip_or_run_sql_test
     def setUp(self):
         # prevent a remote tarantool from clean our session
         if self.srv.is_started():
@@ -55,7 +56,6 @@ def _populate_data(self, table_name):
     def _create_table(self, table_name):
         return self.con.execute(self.ddl % table_name)
 
-    @skip_or_run_sql_test
     def test_dml_response(self):
         table_name = 'foo'
         response = self._create_table(table_name)
@@ -77,7 +77,6 @@ def test_dml_response(self):
         self.assertEqual(response.affected_row_count, 2)
         self.assertEqual(response.data, None)
 
-    @skip_or_run_sql_test
     def test_dql_response(self):
         table_name = 'bar'
         self._create_table(table_name)