Skip to content

Commit d547aef

Browse files
CitoCito
committed
Remove some ignored rules
1 parent c60205d commit d547aef

File tree

4 files changed

+47
-44
lines changed

4 files changed

+47
-44
lines changed

‎docs/make.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python3.9
1+
#!/usr/bin/python3.10
22

33
"""Build HTML from reST files."""
44

‎pyproject.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ max-branches = 41
7575
max-statements = 95
7676

7777
[tool.ruff.per-file-ignores]
78-
# You can use `ruff rule ...` to see what these ignored rules check
79-
"docs/make.py" = ["INP001"]
80-
"tests/*" = ["N8", "PGH004", "PLR0915", "PT009", "S101"]
78+
"docs/*" = [
79+
"INP001" # allow stand-alone scripts
80+
]
81+
"tests/*" = [
82+
"S101" # allow assert statements
83+
]

‎tests/test_pooled_db.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_threadsafety(dbapi, threadsafety): # noqa: F811
5454

5555

5656
@pytest.mark.parametrize("threadsafety", [1, 2])
57-
def test_create_connection(dbapi, threadsafety): # noqa: F811
57+
def test_create_connection(dbapi, threadsafety): # noqa: F811, PLR0915
5858
dbapi.threadsafety = threadsafety
5959
shareable = threadsafety > 1
6060
pool = PooledDB(
@@ -675,7 +675,7 @@ def test_rollback(dbapi, threadsafety): # noqa: F811
675675

676676

677677
@pytest.mark.parametrize("threadsafety", [1, 2])
678-
def test_maxconnections(dbapi, threadsafety): # noqa: F811
678+
def test_maxconnections(dbapi, threadsafety): # noqa: F811, PLR0915
679679
dbapi.threadsafety = threadsafety
680680
shareable = threadsafety > 1
681681
pool = PooledDB(dbapi, 1, 2, 2, 3)

‎tests/test_steady_db.py

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import pytest
1313

1414
from dbutils.steady_db import SteadyDBConnection, SteadyDBCursor
15-
from dbutils.steady_db import connect as SteadyDBconnect
15+
from dbutils.steady_db import connect as steady_db_connect
1616

1717
from . import mock_db as dbapi
1818

@@ -107,13 +107,13 @@ def test_broken_connection():
107107
SteadyDBConnection(None)
108108
with pytest.raises(TypeError):
109109
SteadyDBCursor(None)
110-
db = SteadyDBconnect(dbapi, database='ok')
110+
db = steady_db_connect(dbapi, database='ok')
111111
for i in range(3):
112112
db.close()
113113
del db
114114
with pytest.raises(dbapi.OperationalError):
115-
SteadyDBconnect(dbapi, database='error')
116-
db = SteadyDBconnect(dbapi, database='ok')
115+
steady_db_connect(dbapi, database='error')
116+
db = steady_db_connect(dbapi, database='ok')
117117
cursor = db.cursor()
118118
for i in range(3):
119119
cursor.close()
@@ -126,7 +126,7 @@ def test_broken_connection():
126126

127127
@pytest.mark.parametrize("closeable", [False, True])
128128
def test_close(closeable):
129-
db = SteadyDBconnect(dbapi, closeable=closeable)
129+
db = steady_db_connect(dbapi, closeable=closeable)
130130
assert db._con.valid
131131
db.close()
132132
assert closeable ^ db._con.valid
@@ -138,8 +138,8 @@ def test_close(closeable):
138138
assert not db._con.valid
139139

140140

141-
def test_connection():
142-
db = SteadyDBconnect(
141+
def test_connection(): # noqa: PLR0915
142+
db = steady_db_connect(
143143
dbapi, 0, None, None, None, True,
144144
'SteadyDBTestDB', user='SteadyDBTestUser')
145145
assert isinstance(db, SteadyDBConnection)
@@ -259,7 +259,7 @@ def test_connection():
259259

260260

261261
def test_connection_context_handler():
262-
db = SteadyDBconnect(
262+
db = steady_db_connect(
263263
dbapi, 0, None, None, None, True,
264264
'SteadyDBTestDB', user='SteadyDBTestUser')
265265
assert db._con.session == []
@@ -278,7 +278,7 @@ def test_connection_context_handler():
278278

279279

280280
def test_cursor_context_handler():
281-
db = SteadyDBconnect(
281+
db = steady_db_connect(
282282
dbapi, 0, None, None, None, True,
283283
'SteadyDBTestDB', user='SteadyDBTestUser')
284284
assert db._con.open_cursors == 0
@@ -290,7 +290,7 @@ def test_cursor_context_handler():
290290

291291

292292
def test_cursor_as_iterator_provided():
293-
db = SteadyDBconnect(
293+
db = steady_db_connect(
294294
dbapi, 0, None, None, None, True,
295295
'SteadyDBTestDB', user='SteadyDBTestUser')
296296
assert db._con.open_cursors == 0
@@ -309,7 +309,7 @@ def test_cursor_as_iterator_provided():
309309

310310

311311
def test_cursor_as_iterator_created():
312-
db = SteadyDBconnect(
312+
db = steady_db_connect(
313313
dbapi, 0, None, None, None, True,
314314
'SteadyDBTestDB', user='SteadyDBTestUser')
315315
assert db._con.open_cursors == 0
@@ -322,10 +322,10 @@ def test_cursor_as_iterator_created():
322322

323323

324324
def test_connection_creator_function():
325-
db1 = SteadyDBconnect(
325+
db1 = steady_db_connect(
326326
dbapi, 0, None, None, None, True,
327327
'SteadyDBTestDB', user='SteadyDBTestUser')
328-
db2 = SteadyDBconnect(
328+
db2 = steady_db_connect(
329329
dbapi.connect, 0, None, None, None, True,
330330
'SteadyDBTestDB', user='SteadyDBTestUser')
331331
assert db1.dbapi() == db2.dbapi()
@@ -338,7 +338,7 @@ def test_connection_creator_function():
338338

339339

340340
def test_connection_maxusage():
341-
db = SteadyDBconnect(dbapi, 10)
341+
db = steady_db_connect(dbapi, 10)
342342
cursor = db.cursor()
343343
for i in range(100):
344344
cursor.execute(f'select test{i}')
@@ -389,7 +389,7 @@ def test_connection_maxusage():
389389

390390

391391
def test_connection_setsession():
392-
db = SteadyDBconnect(dbapi, 3, ('set time zone', 'set datestyle'))
392+
db = steady_db_connect(dbapi, 3, ('set time zone', 'set datestyle'))
393393
assert hasattr(db, '_usage')
394394
assert db._usage == 0
395395
assert hasattr(db._con, 'open_cursors')
@@ -448,29 +448,29 @@ def test_connection_setsession():
448448

449449

450450
def test_connection_failures():
451-
db = SteadyDBconnect(dbapi)
451+
db = steady_db_connect(dbapi)
452452
db.close()
453453
db.cursor()
454-
db = SteadyDBconnect(dbapi, failures=dbapi.InternalError)
454+
db = steady_db_connect(dbapi, failures=dbapi.InternalError)
455455
db.close()
456456
db.cursor()
457-
db = SteadyDBconnect(dbapi, failures=dbapi.OperationalError)
457+
db = steady_db_connect(dbapi, failures=dbapi.OperationalError)
458458
db.close()
459459
with pytest.raises(dbapi.InternalError):
460460
db.cursor()
461-
db = SteadyDBconnect(dbapi, failures=(
461+
db = steady_db_connect(dbapi, failures=(
462462
dbapi.OperationalError, dbapi.InterfaceError))
463463
db.close()
464464
with pytest.raises(dbapi.InternalError):
465465
db.cursor()
466-
db = SteadyDBconnect(dbapi, failures=(
466+
db = steady_db_connect(dbapi, failures=(
467467
dbapi.OperationalError, dbapi.InterfaceError, dbapi.InternalError))
468468
db.close()
469469
db.cursor()
470470

471471

472472
def test_connection_failure_error():
473-
db = SteadyDBconnect(dbapi)
473+
db = steady_db_connect(dbapi)
474474
cursor = db.cursor()
475475
db.close()
476476
cursor.execute('select test')
@@ -481,7 +481,7 @@ def test_connection_failure_error():
481481

482482

483483
def test_connection_set_sizes():
484-
db = SteadyDBconnect(dbapi)
484+
db = steady_db_connect(dbapi)
485485
cursor = db.cursor()
486486
cursor.execute('get sizes')
487487
result = cursor.fetchone()
@@ -510,15 +510,15 @@ def test_connection_ping_check():
510510
con_cls = dbapi.Connection
511511
con_cls.has_ping = False
512512
con_cls.num_pings = 0
513-
db = SteadyDBconnect(dbapi)
513+
db = steady_db_connect(dbapi)
514514
db.cursor().execute('select test')
515515
assert con_cls.num_pings == 0
516516
db.close()
517517
db.cursor().execute('select test')
518518
assert con_cls.num_pings == 0
519519
assert db._ping_check() is None
520520
assert con_cls.num_pings == 1
521-
db = SteadyDBconnect(dbapi, ping=7)
521+
db = steady_db_connect(dbapi, ping=7)
522522
db.cursor().execute('select test')
523523
assert con_cls.num_pings == 2
524524
db.close()
@@ -527,15 +527,15 @@ def test_connection_ping_check():
527527
assert db._ping_check() is None
528528
assert con_cls.num_pings == 2
529529
con_cls.has_ping = True
530-
db = SteadyDBconnect(dbapi)
530+
db = steady_db_connect(dbapi)
531531
db.cursor().execute('select test')
532532
assert con_cls.num_pings == 2
533533
db.close()
534534
db.cursor().execute('select test')
535535
assert con_cls.num_pings == 2
536536
assert db._ping_check()
537537
assert con_cls.num_pings == 3
538-
db = SteadyDBconnect(dbapi, ping=1)
538+
db = steady_db_connect(dbapi, ping=1)
539539
db.cursor().execute('select test')
540540
assert con_cls.num_pings == 3
541541
db.close()
@@ -546,13 +546,13 @@ def test_connection_ping_check():
546546
db.close()
547547
assert db._ping_check()
548548
assert con_cls.num_pings == 5
549-
db = SteadyDBconnect(dbapi, ping=7)
549+
db = steady_db_connect(dbapi, ping=7)
550550
db.cursor().execute('select test')
551551
assert con_cls.num_pings == 7
552552
db.close()
553553
db.cursor().execute('select test')
554554
assert con_cls.num_pings == 9
555-
db = SteadyDBconnect(dbapi, ping=3)
555+
db = steady_db_connect(dbapi, ping=3)
556556
assert con_cls.num_pings == 9
557557
db.cursor()
558558
assert con_cls.num_pings == 10
@@ -561,7 +561,7 @@ def test_connection_ping_check():
561561
assert con_cls.num_pings == 11
562562
cursor.execute('select test')
563563
assert con_cls.num_pings == 11
564-
db = SteadyDBconnect(dbapi, ping=5)
564+
db = steady_db_connect(dbapi, ping=5)
565565
assert con_cls.num_pings == 11
566566
db.cursor()
567567
assert con_cls.num_pings == 11
@@ -575,7 +575,7 @@ def test_connection_ping_check():
575575
assert con_cls.num_pings == 12
576576
cursor.execute('select test')
577577
assert con_cls.num_pings == 13
578-
db = SteadyDBconnect(dbapi, ping=7)
578+
db = steady_db_connect(dbapi, ping=7)
579579
assert con_cls.num_pings == 13
580580
db.cursor()
581581
assert con_cls.num_pings == 14
@@ -597,7 +597,7 @@ def test_connection_ping_check():
597597

598598

599599
def test_begin_transaction():
600-
db = SteadyDBconnect(dbapi, database='ok')
600+
db = steady_db_connect(dbapi, database='ok')
601601
cursor = db.cursor()
602602
cursor.close()
603603
cursor.execute('select test12')
@@ -624,7 +624,7 @@ def test_begin_transaction():
624624

625625

626626
def test_with_begin_extension():
627-
db = SteadyDBconnect(dbapi, database='ok')
627+
db = steady_db_connect(dbapi, database='ok')
628628
db._con._begin_called_with = None
629629

630630
def begin(a, b=None, c=7):
@@ -639,7 +639,7 @@ def begin(a, b=None, c=7):
639639

640640

641641
def test_cancel_transaction():
642-
db = SteadyDBconnect(dbapi, database='ok')
642+
db = steady_db_connect(dbapi, database='ok')
643643
cursor = db.cursor()
644644
db.begin()
645645
cursor.execute('select test14')
@@ -650,7 +650,7 @@ def test_cancel_transaction():
650650

651651

652652
def test_with_cancel_extension():
653-
db = SteadyDBconnect(dbapi, database='ok')
653+
db = steady_db_connect(dbapi, database='ok')
654654
db._con._cancel_called = None
655655

656656
def cancel():
@@ -666,20 +666,20 @@ def cancel():
666666

667667

668668
def test_reset_transaction():
669-
db = SteadyDBconnect(dbapi, database='ok')
669+
db = steady_db_connect(dbapi, database='ok')
670670
db.begin()
671671
assert not db._con.session
672672
db.close()
673673
assert not db._con.session
674-
db = SteadyDBconnect(dbapi, database='ok', closeable=False)
674+
db = steady_db_connect(dbapi, database='ok', closeable=False)
675675
db.begin()
676676
assert not db._con.session
677677
db.close()
678678
assert db._con.session == ['rollback']
679679

680680

681681
def test_commit_error():
682-
db = SteadyDBconnect(dbapi, database='ok')
682+
db = steady_db_connect(dbapi, database='ok')
683683
db.begin()
684684
assert not db._con.session
685685
assert db._con.valid
@@ -703,7 +703,7 @@ def test_commit_error():
703703

704704

705705
def test_rollback_error():
706-
db = SteadyDBconnect(dbapi, database='ok')
706+
db = steady_db_connect(dbapi, database='ok')
707707
db.begin()
708708
assert not db._con.session
709709
assert db._con.valid

0 commit comments

Comments
 (0)