Skip to content

Commit 093fe2e

Browse files
DifferentialOrangeDifferentialOrange
committed
pylint: fix bad-classmethod-argument cases
Fix all cases of C0202 bad-classmethod-argument. Part of #270
1 parent 7b54c34 commit 093fe2e

19 files changed

+239
-239
lines changed

‎test/suites/test_connection.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212

1313
class TestSuiteConnection(unittest.TestCase):
1414
@classmethod
15-
def setUpClass(self):
15+
def setUpClass(cls):
1616
print(' CONNECTION '.center(70, '='), file=sys.stderr)
1717
print('-' * 70, file=sys.stderr)
18-
self.srv = TarantoolServer()
19-
self.srv.script = 'test/suites/box.lua'
20-
self.srv.start()
18+
cls.srv = TarantoolServer()
19+
cls.srv.script = 'test/suites/box.lua'
20+
cls.srv.start()
2121

22-
self.adm = self.srv.admin
23-
self.adm(r"""
22+
cls.adm = cls.srv.admin
23+
cls.adm(r"""
2424
box.schema.user.create('test', {password = 'test', if_not_exists = true})
2525
box.schema.user.grant('test', 'read,write,execute', 'universe')
2626
@@ -151,11 +151,11 @@ def my_unpacker_factory(_):
151151
self.assertIsInstance(resp[0], tuple)
152152

153153
@classmethod
154-
def tearDown(self):
155-
if hasattr(self, 'con'):
156-
self.con.close()
154+
def tearDown(cls):
155+
if hasattr(cls, 'con'):
156+
cls.con.close()
157157

158158
@classmethod
159-
def tearDownClass(self):
160-
self.srv.stop()
161-
self.srv.clean()
159+
def tearDownClass(cls):
160+
cls.srv.stop()
161+
cls.srv.clean()

‎test/suites/test_crud.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ def create_server():
2121
class TestSuiteCrud(unittest.TestCase):
2222

2323
@classmethod
24-
def setUpClass(self):
24+
def setUpClass(cls):
2525
print(' CRUD '.center(70, '='), file=sys.stderr)
2626
print('-' * 70, file=sys.stderr)
2727
# Create server and extract helpful fields for tests.
28-
self.srv = create_server()
29-
self.host = self.srv.host
30-
self.port = self.srv.args['primary']
28+
cls.srv = create_server()
29+
cls.host = cls.srv.host
30+
cls.port = cls.srv.args['primary']
3131

3232
def setUp(self):
3333
time.sleep(1)
@@ -749,7 +749,7 @@ def tearDown(self):
749749
self.conn_pool.close()
750750

751751
@classmethod
752-
def tearDownClass(self):
752+
def tearDownClass(cls):
753753
# Stop instance.
754-
self.srv.stop()
755-
self.srv.clean()
754+
cls.srv.stop()
755+
cls.srv.clean()

‎test/suites/test_datetime.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515

1616
class TestSuiteDatetime(unittest.TestCase):
1717
@classmethod
18-
def setUpClass(self):
18+
def setUpClass(cls):
1919
print(' DATETIME EXT TYPE '.center(70, '='), file=sys.stderr)
2020
print('-' * 70, file=sys.stderr)
21-
self.srv = TarantoolServer()
22-
self.srv.script = 'test/suites/box.lua'
23-
self.srv.start()
21+
cls.srv = TarantoolServer()
22+
cls.srv.script = 'test/suites/box.lua'
23+
cls.srv.start()
2424

25-
self.adm = self.srv.admin
26-
self.adm(r"""
25+
cls.adm = cls.srv.admin
26+
cls.adm(r"""
2727
_, datetime = pcall(require, 'datetime')
2828
2929
box.schema.space.create('test')
@@ -54,8 +54,8 @@ def setUpClass(self):
5454
rawset(_G, 'sub', sub)
5555
""")
5656

57-
self.con = tarantool.Connection(self.srv.host, self.srv.args['primary'],
58-
user='test', password='test')
57+
cls.con = tarantool.Connection(cls.srv.host, cls.srv.args['primary'],
58+
user='test', password='test')
5959

6060
def setUp(self):
6161
# prevent a remote tarantool from clean our session
@@ -529,7 +529,7 @@ def test_primary_key(self):
529529
self.assertSequenceEqual(self.con.select('test_pk', data[0]), [data])
530530

531531
@classmethod
532-
def tearDownClass(self):
533-
self.con.close()
534-
self.srv.stop()
535-
self.srv.clean()
532+
def tearDownClass(cls):
533+
cls.con.close()
534+
cls.srv.stop()
535+
cls.srv.clean()

‎test/suites/test_dbapi.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ class TestSuiteDBAPI(dbapi20.DatabaseAPI20Test):
1919
'drink varchar(30))'
2020

2121
@classmethod
22-
def setUpClass(self):
22+
def setUpClass(cls):
2323
print(' DBAPI '.center(70, '='), file=sys.stderr)
2424
print('-' * 70, file=sys.stderr)
25-
self.srv = TarantoolServer()
26-
self.srv.script = 'test/suites/box.lua'
27-
self.srv.start()
28-
self.con = tarantool.Connection(self.srv.host, self.srv.args['primary'])
29-
self.driver = dbapi
30-
self.connect_kw_args = dict(
31-
host=self.srv.host,
32-
port=self.srv.args['primary'])
25+
cls.srv = TarantoolServer()
26+
cls.srv.script = 'test/suites/box.lua'
27+
cls.srv.start()
28+
cls.con = tarantool.Connection(cls.srv.host, cls.srv.args['primary'])
29+
cls.driver = dbapi
30+
cls.connect_kw_args = dict(
31+
host=cls.srv.host,
32+
port=cls.srv.args['primary'])
3333

3434
@skip_or_run_sql_test
3535
def setUp(self):
@@ -43,10 +43,10 @@ def setUp(self):
4343
"execute', 'universe')")
4444

4545
@classmethod
46-
def tearDownClass(self):
47-
self.con.close()
48-
self.srv.stop()
49-
self.srv.clean()
46+
def tearDownClass(cls):
47+
cls.con.close()
48+
cls.srv.stop()
49+
cls.srv.clean()
5050

5151
def test_rowcount(self):
5252
con = self._connect()

‎test/suites/test_decimal.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
class TestSuiteDecimal(unittest.TestCase):
1616
@classmethod
17-
def setUpClass(self):
17+
def setUpClass(cls):
1818
print(' DECIMAL EXT TYPE '.center(70, '='), file=sys.stderr)
1919
print('-' * 70, file=sys.stderr)
20-
self.srv = TarantoolServer()
21-
self.srv.script = 'test/suites/box.lua'
22-
self.srv.start()
20+
cls.srv = TarantoolServer()
21+
cls.srv.script = 'test/suites/box.lua'
22+
cls.srv.start()
2323

24-
self.adm = self.srv.admin
25-
self.adm(r"""
24+
cls.adm = cls.srv.admin
25+
cls.adm(r"""
2626
_, decimal = pcall(require, 'decimal')
2727
2828
box.schema.space.create('test')
@@ -43,8 +43,8 @@ def setUpClass(self):
4343
box.schema.user.grant('test', 'read,write,execute', 'universe')
4444
""")
4545

46-
self.con = tarantool.Connection(self.srv.host, self.srv.args['primary'],
47-
user='test', password='test')
46+
cls.con = tarantool.Connection(cls.srv.host, cls.srv.args['primary'],
47+
user='test', password='test')
4848

4949
def setUp(self):
5050
# prevent a remote tarantool from clean our session
@@ -422,7 +422,7 @@ def test_primary_key(self):
422422

423423

424424
@classmethod
425-
def tearDownClass(self):
426-
self.con.close()
427-
self.srv.stop()
428-
self.srv.clean()
425+
def tearDownClass(cls):
426+
cls.con.close()
427+
cls.srv.stop()
428+
cls.srv.clean()

‎test/suites/test_dml.py

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,44 @@
88

99
class TestSuiteRequest(unittest.TestCase):
1010
@classmethod
11-
def setUpClass(self):
11+
def setUpClass(cls):
1212
print(' DML '.center(70, '='), file=sys.stderr)
1313
print('-' * 70, file=sys.stderr)
14-
self.srv = TarantoolServer()
15-
self.srv.script = 'test/suites/box.lua'
16-
self.srv.start()
17-
self.con = tarantool.Connection(self.srv.host, self.srv.args['primary'])
18-
self.adm = self.srv.admin
19-
self.space_created = self.adm("box.schema.create_space('space_1')")
20-
self.adm("""
14+
cls.srv = TarantoolServer()
15+
cls.srv.script = 'test/suites/box.lua'
16+
cls.srv.start()
17+
cls.con = tarantool.Connection(cls.srv.host, cls.srv.args['primary'])
18+
cls.adm = cls.srv.admin
19+
cls.space_created = cls.adm("box.schema.create_space('space_1')")
20+
cls.adm("""
2121
box.space['space_1']:create_index('primary', {
2222
type = 'tree',
2323
parts = {1, 'num'},
2424
unique = true})
2525
""".replace('\n', ' '))
26-
self.adm("""
26+
cls.adm("""
2727
box.space['space_1']:create_index('secondary', {
2828
type = 'tree',
2929
parts = {2, 'num', 3, 'str'},
3030
unique = false})
3131
""".replace('\n', ' '))
32-
self.space_created = self.adm("box.schema.create_space('space_2')")
33-
self.adm("""
32+
cls.space_created = cls.adm("box.schema.create_space('space_2')")
33+
cls.adm("""
3434
box.space['space_2']:create_index('primary', {
3535
type = 'hash',
3636
parts = {1, 'num'},
3737
unique = true})
3838
""".replace('\n', ' '))
39-
self.adm("json = require('json')")
40-
self.adm("fiber = require('fiber')")
41-
self.adm("uuid = require('uuid')")
39+
cls.adm("json = require('json')")
40+
cls.adm("fiber = require('fiber')")
41+
cls.adm("uuid = require('uuid')")
4242

4343
if not sys.platform.startswith("win"):
44-
self.sock_srv = TarantoolServer(create_unix_socket=True)
45-
self.sock_srv.script = 'test/suites/box.lua'
46-
self.sock_srv.start()
44+
cls.sock_srv = TarantoolServer(create_unix_socket=True)
45+
cls.sock_srv.script = 'test/suites/box.lua'
46+
cls.sock_srv.start()
4747
else:
48-
self.sock_srv = None
48+
cls.sock_srv = None
4949

5050
def setUp(self):
5151
# prevent a remote tarantool from clean our session
@@ -399,11 +399,11 @@ def test_16_extra_error_info_fields(self):
399399
self.fail('Expected error')
400400

401401
@classmethod
402-
def tearDownClass(self):
403-
self.con.close()
404-
self.srv.stop()
405-
self.srv.clean()
406-
407-
if self.sock_srv is not None:
408-
self.sock_srv.stop()
409-
self.sock_srv.clean()
402+
def tearDownClass(cls):
403+
cls.con.close()
404+
cls.srv.stop()
405+
cls.srv.clean()
406+
407+
if cls.sock_srv is not None:
408+
cls.sock_srv.stop()
409+
cls.sock_srv.clean()

‎test/suites/test_encoding.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,34 @@ class TestSuiteEncoding(unittest.TestCase):
1111
# pylint: disable=invalid-name
1212

1313
@classmethod
14-
def setUpClass(self):
14+
def setUpClass(cls):
1515
print(' ENCODING '.center(70, '='), file=sys.stderr)
1616
print('-' * 70, file=sys.stderr)
17-
self.srv = TarantoolServer()
18-
self.srv.script = 'test/suites/box.lua'
19-
self.srv.start()
17+
cls.srv = TarantoolServer()
18+
cls.srv.script = 'test/suites/box.lua'
19+
cls.srv.start()
2020

21-
self.srv.admin("""
21+
cls.srv.admin("""
2222
box.schema.user.create('test', { password = 'test' })
2323
box.schema.user.grant('test', 'execute,read,write', 'universe')
2424
""")
2525

26-
args = [self.srv.host, self.srv.args['primary']]
26+
args = [cls.srv.host, cls.srv.args['primary']]
2727
kwargs = { 'user': 'test', 'password': 'test' }
28-
self.con_encoding_utf8 = tarantool.Connection(*args, encoding='utf-8', **kwargs)
29-
self.con_encoding_none = tarantool.Connection(*args, encoding=None, **kwargs)
30-
self.conns = [self.con_encoding_utf8, self.con_encoding_none]
28+
cls.con_encoding_utf8 = tarantool.Connection(*args, encoding='utf-8', **kwargs)
29+
cls.con_encoding_none = tarantool.Connection(*args, encoding=None, **kwargs)
30+
cls.conns = [cls.con_encoding_utf8, cls.con_encoding_none]
3131

32-
self.srv.admin("box.schema.create_space('space_str')")
33-
self.srv.admin("""
32+
cls.srv.admin("box.schema.create_space('space_str')")
33+
cls.srv.admin("""
3434
box.space['space_str']:create_index('primary', {
3535
type = 'tree',
3636
parts = {1, 'str'},
3737
unique = true})
3838
""".replace('\n', ' '))
3939

40-
self.srv.admin("box.schema.create_space('space_varbin')")
41-
self.srv.admin(r"""
40+
cls.srv.admin("box.schema.create_space('space_varbin')")
41+
cls.srv.admin(r"""
4242
box.space['space_varbin']:format({
4343
{
4444
'id',
@@ -52,13 +52,13 @@ def setUpClass(self):
5252
}
5353
})
5454
""".replace('\n', ' '))
55-
self.srv.admin("""
55+
cls.srv.admin("""
5656
box.space['space_varbin']:create_index('id', {
5757
type = 'tree',
5858
parts = {1, 'number'},
5959
unique = true})
6060
""".replace('\n', ' '))
61-
self.srv.admin("""
61+
cls.srv.admin("""
6262
box.space['space_varbin']:create_index('varbin', {
6363
type = 'tree',
6464
parts = {2, 'varbinary'},
@@ -197,8 +197,8 @@ def test_02_05_error_extra_info_decode_for_encoding_none_behavior(self):
197197
self.fail('Expected error')
198198

199199
@classmethod
200-
def tearDownClass(self):
201-
for con in self.conns:
200+
def tearDownClass(cls):
201+
for con in cls.conns:
202202
con.close()
203-
self.srv.stop()
204-
self.srv.clean()
203+
cls.srv.stop()
204+
cls.srv.clean()

0 commit comments

Comments
 (0)