Skip to content

Commit 9c6e3ce

Browse files
author
Ivan Lazarev
committed
[PBCKP-220] all gdb tests fixup
1 parent 26939d6 commit 9c6e3ce

File tree

12 files changed

+94
-3
lines changed

12 files changed

+94
-3
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ env:
3434
- PG_VERSION=10 PG_BRANCH=REL_10_STABLE
3535
- PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
3636
- PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
37+
- PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE PGPROBACKUP_GDB=ON PG_PROBACKUP_TEST_BASIC=OFF
3738
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=archive
3839
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
3940
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup

‎tests/archive.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,8 @@ def test_pgpro434_3(self):
228228
Check pg_stop_backup_timeout, needed backup_timeout
229229
Fixed in commit d84d79668b0c139 and assert fixed by ptrack 1.7
230230
"""
231+
self._check_gdb_flag_or_skip_test()
232+
231233
fname = self.id().split('.')[3]
232234
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
233235
node = self.make_simple_node(

‎tests/backup.py‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,6 +1095,8 @@ def test_tablespace_handling_2(self):
10951095
# @unittest.skip("skip")
10961096
def test_drop_rel_during_full_backup(self):
10971097
""""""
1098+
self._check_gdb_flag_or_skip_test()
1099+
10981100
fname = self.id().split('.')[3]
10991101
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
11001102
node = self.make_simple_node(
@@ -1244,6 +1246,8 @@ def test_drop_db_during_full_backup(self):
12441246
# @unittest.skip("skip")
12451247
def test_drop_rel_during_backup_delta(self):
12461248
""""""
1249+
self._check_gdb_flag_or_skip_test()
1250+
12471251
fname = self.id().split('.')[3]
12481252
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
12491253
node = self.make_simple_node(
@@ -1313,6 +1317,8 @@ def test_drop_rel_during_backup_delta(self):
13131317
# @unittest.skip("skip")
13141318
def test_drop_rel_during_backup_page(self):
13151319
""""""
1320+
self._check_gdb_flag_or_skip_test()
1321+
13161322
fname = self.id().split('.')[3]
13171323
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
13181324
node = self.make_simple_node(
@@ -1445,6 +1451,8 @@ def test_basic_temp_slot_for_stream_backup(self):
14451451
# @unittest.skip("skip")
14461452
def test_backup_concurrent_drop_table(self):
14471453
""""""
1454+
self._check_gdb_flag_or_skip_test()
1455+
14481456
fname = self.id().split('.')[3]
14491457
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
14501458
node = self.make_simple_node(
@@ -1579,6 +1587,8 @@ def test_pg_11_adjusted_wal_segment_size(self):
15791587
# @unittest.skip("skip")
15801588
def test_sigint_handling(self):
15811589
""""""
1590+
self._check_gdb_flag_or_skip_test()
1591+
15821592
fname = self.id().split('.')[3]
15831593
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
15841594
node = self.make_simple_node(
@@ -1618,6 +1628,8 @@ def test_sigint_handling(self):
16181628
# @unittest.skip("skip")
16191629
def test_sigterm_handling(self):
16201630
""""""
1631+
self._check_gdb_flag_or_skip_test()
1632+
16211633
fname = self.id().split('.')[3]
16221634
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
16231635
node = self.make_simple_node(
@@ -1656,6 +1668,8 @@ def test_sigterm_handling(self):
16561668
# @unittest.skip("skip")
16571669
def test_sigquit_handling(self):
16581670
""""""
1671+
self._check_gdb_flag_or_skip_test()
1672+
16591673
fname = self.id().split('.')[3]
16601674
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
16611675
node = self.make_simple_node(
@@ -2906,6 +2920,8 @@ def test_incr_backup_filenode_map(self):
29062920
# @unittest.skip("skip")
29072921
def test_missing_wal_segment(self):
29082922
""""""
2923+
self._check_gdb_flag_or_skip_test()
2924+
29092925
fname = self.id().split('.')[3]
29102926
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
29112927
node = self.make_simple_node(
@@ -3292,6 +3308,8 @@ def test_basic_backup_default_transaction_read_only(self):
32923308
# @unittest.skip("skip")
32933309
def test_backup_atexit(self):
32943310
""""""
3311+
self._check_gdb_flag_or_skip_test()
3312+
32953313
fname = self.id().split('.')[3]
32963314
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
32973315
node = self.make_simple_node(

‎tests/checkdb.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ class CheckdbTest(ProbackupTest, unittest.TestCase):
1717
# @unittest.skip("skip")
1818
def test_checkdb_amcheck_only_sanity(self):
1919
""""""
20+
self._check_gdb_flag_or_skip_test()
21+
2022
fname = self.id().split('.')[3]
2123
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
2224
node = self.make_simple_node(

‎tests/helpers/ptrack_helpers.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1879,10 +1879,7 @@ def __str__(self):
18791879
return '\n ERROR: {0}\n'.format(repr(self.message))
18801880

18811881

1882-
#TODO REVIEW XXX no inheritance needed
1883-
# class GDBobj(ProbackupTest):
18841882
class GDBobj:
1885-
# TODO REVIEW XXX Type specification env:ProbackupTest is only for python3, is it ok?
18861883
def __init__(self, cmd, env: ProbackupTest, attach=False):
18871884
self.verbose = env.verbose
18881885
self.output = ''

‎tests/locking.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ def test_locking_running_validate_1(self):
1717
run validate, expect it to successfully executed,
1818
concurrent RUNNING backup with pid file and active process is legal
1919
"""
20+
self._check_gdb_flag_or_skip_test()
21+
2022
fname = self.id().split('.')[3]
2123
node = self.make_simple_node(
2224
base_dir=os.path.join(module_name, fname, 'node'),
@@ -72,6 +74,8 @@ def test_locking_running_validate_2(self):
7274
RUNNING backup with pid file AND without active pid is legal,
7375
but his status must be changed to ERROR and pid file is deleted
7476
"""
77+
self._check_gdb_flag_or_skip_test()
78+
7579
fname = self.id().split('.')[3]
7680
node = self.make_simple_node(
7781
base_dir=os.path.join(module_name, fname, 'node'),
@@ -142,6 +146,8 @@ def test_locking_running_validate_2_specific_id(self):
142146
RUNNING backup with pid file AND without active pid is legal,
143147
but his status must be changed to ERROR and pid file is deleted
144148
"""
149+
self._check_gdb_flag_or_skip_test()
150+
145151
fname = self.id().split('.')[3]
146152
node = self.make_simple_node(
147153
base_dir=os.path.join(module_name, fname, 'node'),
@@ -240,6 +246,8 @@ def test_locking_running_3(self):
240246
RUNNING backup without pid file AND without active pid is legal,
241247
his status must be changed to ERROR
242248
"""
249+
self._check_gdb_flag_or_skip_test()
250+
243251
fname = self.id().split('.')[3]
244252
node = self.make_simple_node(
245253
base_dir=os.path.join(module_name, fname, 'node'),
@@ -310,6 +318,8 @@ def test_locking_restore_locked(self):
310318
Expect restore to sucseed because read-only locks
311319
do not conflict
312320
"""
321+
self._check_gdb_flag_or_skip_test()
322+
313323
fname = self.id().split('.')[3]
314324
node = self.make_simple_node(
315325
base_dir=os.path.join(module_name, fname, 'node'),
@@ -352,6 +362,8 @@ def test_concurrent_delete_and_restore(self):
352362
Expect restore to fail because validation of
353363
intermediate backup is impossible
354364
"""
365+
self._check_gdb_flag_or_skip_test()
366+
355367
fname = self.id().split('.')[3]
356368
node = self.make_simple_node(
357369
base_dir=os.path.join(module_name, fname, 'node'),
@@ -443,6 +455,8 @@ def test_locking_concurren_restore_and_delete(self):
443455
and stop it in the middle, delete full backup.
444456
Expect it to fail.
445457
"""
458+
self._check_gdb_flag_or_skip_test()
459+
446460
fname = self.id().split('.')[3]
447461
node = self.make_simple_node(
448462
base_dir=os.path.join(module_name, fname, 'node'),
@@ -585,6 +599,8 @@ def test_shared_lock(self):
585599
"""
586600
Make sure that shared lock leaves no files with pids
587601
"""
602+
self._check_gdb_flag_or_skip_test()
603+
588604
fname = self.id().split('.')[3]
589605
node = self.make_simple_node(
590606
base_dir=os.path.join(module_name, fname, 'node'),

‎tests/logging.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ class LogTest(ProbackupTest, unittest.TestCase):
1212
# @unittest.expectedFailure
1313
# PGPRO-2154
1414
def test_log_rotation(self):
15+
"""
16+
"""
17+
self._check_gdb_flag_or_skip_test()
18+
1519
fname = self.id().split('.')[3]
1620
node = self.make_simple_node(
1721
base_dir=os.path.join(module_name, fname, 'node'),

‎tests/merge.py‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,8 @@ def test_continue_failed_merge(self):
975975
"""
976976
Check that failed MERGE can be continued
977977
"""
978+
self._check_gdb_flag_or_skip_test()
979+
978980
fname = self.id().split('.')[3]
979981
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
980982
node = self.make_simple_node(
@@ -1051,6 +1053,8 @@ def test_continue_failed_merge_with_corrupted_delta_backup(self):
10511053
"""
10521054
Fail merge via gdb, corrupt DELTA backup, try to continue merge
10531055
"""
1056+
self._check_gdb_flag_or_skip_test()
1057+
10541058
fname = self.id().split('.')[3]
10551059
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
10561060
node = self.make_simple_node(
@@ -1148,6 +1152,8 @@ def test_continue_failed_merge_2(self):
11481152
"""
11491153
Check that failed MERGE on delete can be continued
11501154
"""
1155+
self._check_gdb_flag_or_skip_test()
1156+
11511157
fname = self.id().split('.')[3]
11521158
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
11531159
node = self.make_simple_node(
@@ -1219,6 +1225,8 @@ def test_continue_failed_merge_3(self):
12191225
Check that failed MERGE cannot be continued if intermediate
12201226
backup is missing.
12211227
"""
1228+
self._check_gdb_flag_or_skip_test()
1229+
12221230
fname = self.id().split('.')[3]
12231231
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
12241232
node = self.make_simple_node(
@@ -1409,6 +1417,8 @@ def test_crash_after_opening_backup_control_1(self):
14091417
check that crashing after opening backup.control
14101418
for writing will not result in losing backup metadata
14111419
"""
1420+
self._check_gdb_flag_or_skip_test()
1421+
14121422
fname = self.id().split('.')[3]
14131423
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
14141424
node = self.make_simple_node(
@@ -1461,6 +1471,8 @@ def test_crash_after_opening_backup_control_2(self):
14611471
for writing will not result in losing metadata about backup files
14621472
TODO: rewrite
14631473
"""
1474+
self._check_gdb_flag_or_skip_test()
1475+
14641476
fname = self.id().split('.')[3]
14651477
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
14661478
node = self.make_simple_node(
@@ -1552,6 +1564,8 @@ def test_losing_file_after_failed_merge(self):
15521564
for writing will not result in losing metadata about backup files
15531565
TODO: rewrite
15541566
"""
1567+
self._check_gdb_flag_or_skip_test()
1568+
15551569
fname = self.id().split('.')[3]
15561570
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
15571571
node = self.make_simple_node(
@@ -1639,6 +1653,8 @@ def test_losing_file_after_failed_merge(self):
16391653
def test_failed_merge_after_delete(self):
16401654
"""
16411655
"""
1656+
self._check_gdb_flag_or_skip_test()
1657+
16421658
fname = self.id().split('.')[3]
16431659
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
16441660
node = self.make_simple_node(
@@ -1720,6 +1736,8 @@ def test_failed_merge_after_delete(self):
17201736
def test_failed_merge_after_delete_1(self):
17211737
"""
17221738
"""
1739+
self._check_gdb_flag_or_skip_test()
1740+
17231741
fname = self.id().split('.')[3]
17241742
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
17251743
node = self.make_simple_node(
@@ -1796,6 +1814,8 @@ def test_failed_merge_after_delete_1(self):
17961814
def test_failed_merge_after_delete_2(self):
17971815
"""
17981816
"""
1817+
self._check_gdb_flag_or_skip_test()
1818+
17991819
fname = self.id().split('.')[3]
18001820
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
18011821
node = self.make_simple_node(
@@ -1858,6 +1878,8 @@ def test_failed_merge_after_delete_2(self):
18581878
def test_failed_merge_after_delete_3(self):
18591879
"""
18601880
"""
1881+
self._check_gdb_flag_or_skip_test()
1882+
18611883
fname = self.id().split('.')[3]
18621884
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
18631885
node = self.make_simple_node(
@@ -2281,6 +2303,8 @@ def test_smart_merge(self):
22812303
def test_idempotent_merge(self):
22822304
"""
22832305
"""
2306+
self._check_gdb_flag_or_skip_test()
2307+
22842308
fname = self.id().split('.')[3]
22852309
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
22862310
node = self.make_simple_node(
@@ -2580,6 +2604,8 @@ def test_merge_page_header_map_retry(self):
25802604
page header map cannot be trusted when
25812605
running retry
25822606
"""
2607+
self._check_gdb_flag_or_skip_test()
2608+
25832609
fname = self.id().split('.')[3]
25842610
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
25852611
node = self.make_simple_node(
@@ -2626,6 +2652,8 @@ def test_merge_page_header_map_retry(self):
26262652
def test_missing_data_file(self):
26272653
"""
26282654
"""
2655+
self._check_gdb_flag_or_skip_test()
2656+
26292657
fname = self.id().split('.')[3]
26302658
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
26312659
node = self.make_simple_node(
@@ -2684,6 +2712,8 @@ def test_missing_data_file(self):
26842712
def test_missing_non_data_file(self):
26852713
"""
26862714
"""
2715+
self._check_gdb_flag_or_skip_test()
2716+
26872717
fname = self.id().split('.')[3]
26882718
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
26892719
node = self.make_simple_node(
@@ -2741,6 +2771,8 @@ def test_missing_non_data_file(self):
27412771
def test_merge_remote_mode(self):
27422772
"""
27432773
"""
2774+
self._check_gdb_flag_or_skip_test()
2775+
27442776
fname = self.id().split('.')[3]
27452777
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
27462778
node = self.make_simple_node(

‎tests/replica.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,7 @@ def test_replica_stop_lsn_null_offset(self):
719719
def test_replica_stop_lsn_null_offset_next_record(self):
720720
"""
721721
"""
722+
self._check_gdb_flag_or_skip_test()
722723

723724
fname = self.id().split('.')[3]
724725
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')

‎tests/restore.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2379,6 +2379,8 @@ def test_pg_11_group_access(self):
23792379
# @unittest.skip("skip")
23802380
def test_restore_concurrent_drop_table(self):
23812381
""""""
2382+
self._check_gdb_flag_or_skip_test()
2383+
23822384
fname = self.id().split('.')[3]
23832385
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
23842386
node = self.make_simple_node(
@@ -3797,6 +3799,8 @@ def test_truncate_postgresql_auto_conf(self):
37973799
# @unittest.skip("skip")
37983800
def test_concurrent_restore(self):
37993801
""""""
3802+
self._check_gdb_flag_or_skip_test()
3803+
38003804
fname = self.id().split('.')[3]
38013805
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
38023806
node = self.make_simple_node(

0 commit comments

Comments
 (0)