Skip to content

Commit 0edd958

Browse files
committed
s/test_needs_gdb/need_gdb/
fixtures plugin fails to fill 'func' fixture for 'test_needs_gdb' :-(
1 parent 7b587f7 commit 0edd958

14 files changed

+74
-74
lines changed

tests/archive_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import gzip
44
import unittest
55
from .helpers.ptrack_helpers import ProbackupTest, ProbackupException, GdbException
6-
from .helpers.ptrack_helpers import tail_file, test_needs_gdb
6+
from .helpers.ptrack_helpers import tail_file, needs_gdb
77
from datetime import datetime, timedelta
88
import subprocess
99
from sys import exit
@@ -205,7 +205,7 @@ def test_pgpro434_2(self):
205205
'data after restore not equal to original data')
206206

207207
# @unittest.skip("skip")
208-
@test_needs_gdb
208+
@needs_gdb
209209
def test_pgpro434_3(self):
210210
"""
211211
Check pg_stop_backup_timeout, needed backup_timeout
@@ -262,7 +262,7 @@ def test_pgpro434_3(self):
262262
'PostgreSQL crashed because of a failed assert')
263263

264264
# @unittest.skip("skip")
265-
@test_needs_gdb
265+
@needs_gdb
266266
def test_pgpro434_4(self):
267267
"""
268268
Check pg_stop_backup_timeout, libpq-timeout requested.

tests/backup_test.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import re
44
from time import sleep, time
55
from .helpers.ptrack_helpers import base36enc, ProbackupTest, ProbackupException
6-
from .helpers.ptrack_helpers import test_needs_gdb
6+
from .helpers.ptrack_helpers import needs_gdb
77
import shutil
88
from distutils.dir_util import copy_tree
99
from testgres import ProcessType, QueryException
@@ -1091,7 +1091,7 @@ def test_tablespace_handling_2(self):
10911091
repr(e.message), self.cmd))
10921092

10931093
# @unittest.skip("skip")
1094-
@test_needs_gdb
1094+
@needs_gdb
10951095
def test_drop_rel_during_full_backup(self):
10961096
""""""
10971097

@@ -1234,7 +1234,7 @@ def test_drop_db_during_full_backup(self):
12341234
self.compare_pgdata(pgdata, pgdata_restored)
12351235

12361236
# @unittest.skip("skip")
1237-
@test_needs_gdb
1237+
@needs_gdb
12381238
def test_drop_rel_during_backup_delta(self):
12391239
""""""
12401240

@@ -1301,7 +1301,7 @@ def test_drop_rel_during_backup_delta(self):
13011301
self.compare_pgdata(pgdata, pgdata_restored)
13021302

13031303
# @unittest.skip("skip")
1304-
@test_needs_gdb
1304+
@needs_gdb
13051305
def test_drop_rel_during_backup_page(self):
13061306
""""""
13071307

@@ -1420,7 +1420,7 @@ def test_basic_temp_slot_for_stream_backup(self):
14201420
options=['--stream', '--slot=slot_1', '--temp-slot'])
14211421

14221422
# @unittest.skip("skip")
1423-
@test_needs_gdb
1423+
@needs_gdb
14241424
def test_backup_concurrent_drop_table(self):
14251425
""""""
14261426

@@ -1548,7 +1548,7 @@ def test_pg_11_adjusted_wal_segment_size(self):
15481548
self.compare_pgdata(pgdata, pgdata_restored)
15491549

15501550
# @unittest.skip("skip")
1551-
@test_needs_gdb
1551+
@needs_gdb
15521552
def test_sigint_handling(self):
15531553
""""""
15541554

@@ -1585,7 +1585,7 @@ def test_sigint_handling(self):
15851585
'Backup STATUS should be "ERROR"')
15861586

15871587
# @unittest.skip("skip")
1588-
@test_needs_gdb
1588+
@needs_gdb
15891589
def test_sigterm_handling(self):
15901590
""""""
15911591

@@ -1621,7 +1621,7 @@ def test_sigterm_handling(self):
16211621
'Backup STATUS should be "ERROR"')
16221622

16231623
# @unittest.skip("skip")
1624-
@test_needs_gdb
1624+
@needs_gdb
16251625
def test_sigquit_handling(self):
16261626
""""""
16271627

@@ -2725,7 +2725,7 @@ def test_incr_backup_filenode_map(self):
27252725
'select 1')
27262726

27272727
# @unittest.skip("skip")
2728-
@test_needs_gdb
2728+
@needs_gdb
27292729
def test_missing_wal_segment(self):
27302730
""""""
27312731

@@ -3057,7 +3057,7 @@ def test_basic_backup_default_transaction_read_only(self):
30573057
self.backup_node(backup_dir, 'node', node, backup_type='page')
30583058

30593059
# @unittest.skip("skip")
3060-
@test_needs_gdb
3060+
@needs_gdb
30613061
def test_backup_atexit(self):
30623062
""""""
30633063

tests/checkdb_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import unittest
33
from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
4-
from .helpers.ptrack_helpers import test_needs_gdb
4+
from .helpers.ptrack_helpers import needs_gdb
55
from datetime import datetime, timedelta
66
import subprocess
77
from testgres import QueryException
@@ -13,7 +13,7 @@
1313
class CheckdbTest(ProbackupTest, unittest.TestCase):
1414

1515
# @unittest.skip("skip")
16-
@test_needs_gdb
16+
@needs_gdb
1717
def test_checkdb_amcheck_only_sanity(self):
1818
""""""
1919

@@ -550,7 +550,7 @@ def test_checkdb_checkunique(self):
550550
node.stop()
551551

552552
# @unittest.skip("skip")
553-
@test_needs_gdb
553+
@needs_gdb
554554
def test_checkdb_sigint_handling(self):
555555
""""""
556556

tests/delta_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import unittest
33
from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
4-
from .helpers.ptrack_helpers import test_needs_gdb
4+
from .helpers.ptrack_helpers import needs_gdb
55
from datetime import datetime, timedelta
66
from testgres import QueryException
77
import subprocess
@@ -439,7 +439,7 @@ def test_delta_multiple_segments(self):
439439
self.compare_pgdata(pgdata, pgdata_restored)
440440

441441
# @unittest.skip("skip")
442-
@test_needs_gdb
442+
@needs_gdb
443443
def test_delta_vacuum_full(self):
444444
"""
445445
make node, make full and delta stream backups,

tests/helpers/ptrack_helpers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,7 +2006,7 @@ def _check_gdb_flag_or_skip_test(self):
20062006
else:
20072007
self.fail("use of gdb is not possible")
20082008

2009-
def test_needs_gdb(func):
2009+
def needs_gdb(func):
20102010
def wrapped(self):
20112011
self._gdb_decorated = True
20122012
self._check_gdb_flag_or_skip_test()
@@ -2030,7 +2030,7 @@ def __init__(self, cmd, env, attach=False):
20302030

20312031
# Check gdb flag is set up
20322032
if not getattr(env, "_gdb_decorated", False):
2033-
raise GdbException("Test should be marked with @test_needs_gdb")
2033+
raise GdbException("Test should be marked with @needs_gdb")
20342034
if not env._gdb_enabled:
20352035
raise GdbException("No `PGPROBACKUP_GDB=on` is set.")
20362036
if not env._gdb_ok:

tests/locking_test.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
import os
33
from time import sleep
44
from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
5-
from .helpers.ptrack_helpers import test_needs_gdb
5+
from .helpers.ptrack_helpers import needs_gdb
66

77

88
class LockingTest(ProbackupTest, unittest.TestCase):
99

1010
# @unittest.skip("skip")
1111
# @unittest.expectedFailure
12-
@test_needs_gdb
12+
@needs_gdb
1313
def test_locking_running_validate_1(self):
1414
"""
1515
make node, take full backup, stop it in the middle
@@ -62,7 +62,7 @@ def test_locking_running_validate_1(self):
6262
# Clean after yourself
6363
gdb.kill()
6464

65-
@test_needs_gdb
65+
@needs_gdb
6666
def test_locking_running_validate_2(self):
6767
"""
6868
make node, take full backup, stop it in the middle,
@@ -131,7 +131,7 @@ def test_locking_running_validate_2(self):
131131
# Clean after yourself
132132
gdb.kill()
133133

134-
@test_needs_gdb
134+
@needs_gdb
135135
def test_locking_running_validate_2_specific_id(self):
136136
"""
137137
make node, take full backup, stop it in the middle,
@@ -230,7 +230,7 @@ def test_locking_running_validate_2_specific_id(self):
230230
# Clean after yourself
231231
gdb.kill()
232232

233-
@test_needs_gdb
233+
@needs_gdb
234234
def test_locking_running_3(self):
235235
"""
236236
make node, take full backup, stop it in the middle,
@@ -300,7 +300,7 @@ def test_locking_running_3(self):
300300
# Clean after yourself
301301
gdb.kill()
302302

303-
@test_needs_gdb
303+
@needs_gdb
304304
def test_locking_restore_locked(self):
305305
"""
306306
make node, take full backup, take two page backups,
@@ -342,7 +342,7 @@ def test_locking_restore_locked(self):
342342
# Clean after yourself
343343
gdb.kill()
344344

345-
@test_needs_gdb
345+
@needs_gdb
346346
def test_concurrent_delete_and_restore(self):
347347
"""
348348
make node, take full backup, take page backup,
@@ -399,7 +399,7 @@ def test_concurrent_delete_and_restore(self):
399399
# Clean after yourself
400400
gdb.kill()
401401

402-
@test_needs_gdb
402+
@needs_gdb
403403
def test_locking_concurrent_validate_and_backup(self):
404404
"""
405405
make node, take full backup, launch validate
@@ -435,7 +435,7 @@ def test_locking_concurrent_validate_and_backup(self):
435435
# Clean after yourself
436436
gdb.kill()
437437

438-
@test_needs_gdb
438+
@needs_gdb
439439
def test_locking_concurren_restore_and_delete(self):
440440
"""
441441
make node, take full backup, launch restore
@@ -573,7 +573,7 @@ def test_empty_lock_file(self):
573573
# p1.wait()
574574
# p2.wait()
575575

576-
@test_needs_gdb
576+
@needs_gdb
577577
def test_shared_lock(self):
578578
"""
579579
Make sure that shared lock leaves no files with pids

tests/logging_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import unittest
22
import os
33
from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
4-
from .helpers.ptrack_helpers import test_needs_gdb
4+
from .helpers.ptrack_helpers import needs_gdb
55
import datetime
66

77
class LogTest(ProbackupTest, unittest.TestCase):
88

99
# @unittest.skip("skip")
1010
# @unittest.expectedFailure
1111
# PGPRO-2154
12-
@test_needs_gdb
12+
@needs_gdb
1313
def test_log_rotation(self):
1414
"""
1515
"""

0 commit comments

Comments
 (0)