Skip to content

Commit b61df02

Browse files
gsmolkgsmolk
committed
tests: windows compatibility, cross-platform path for base_dir
1 parent 800ba04 commit b61df02

32 files changed

+287
-282
lines changed

‎tests/archive.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_pgpro434_1(self):
2121
fname = self.id().split('.')[3]
2222
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
2323
node = self.make_simple_node(
24-
base_dir="{0}/{1}/node".format(module_name, fname),
24+
base_dir=os.path.join(module_name, fname, 'node'),
2525
set_replication=True,
2626
initdb_params=['--data-checksums'],
2727
pg_options={
@@ -79,7 +79,7 @@ def test_pgpro434_2(self):
7979
fname = self.id().split('.')[3]
8080
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
8181
node = self.make_simple_node(
82-
base_dir="{0}/{1}/node".format(module_name, fname),
82+
base_dir=os.path.join(module_name, fname, 'node'),
8383
set_replication=True,
8484
initdb_params=['--data-checksums'],
8585
pg_options={
@@ -228,7 +228,7 @@ def test_pgpro434_3(self):
228228
fname = self.id().split('.')[3]
229229
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
230230
node = self.make_simple_node(
231-
base_dir="{0}/{1}/node".format(module_name, fname),
231+
base_dir=os.path.join(module_name, fname, 'node'),
232232
set_replication=True,
233233
initdb_params=['--data-checksums'],
234234
pg_options={
@@ -283,7 +283,7 @@ def test_arhive_push_file_exists(self):
283283
fname = self.id().split('.')[3]
284284
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
285285
node = self.make_simple_node(
286-
base_dir="{0}/{1}/node".format(module_name, fname),
286+
base_dir=os.path.join(module_name, fname, 'node'),
287287
set_replication=True,
288288
initdb_params=['--data-checksums'],
289289
pg_options={
@@ -352,7 +352,7 @@ def test_arhive_push_file_exists_overwrite(self):
352352
fname = self.id().split('.')[3]
353353
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
354354
node = self.make_simple_node(
355-
base_dir="{0}/{1}/node".format(module_name, fname),
355+
base_dir=os.path.join(module_name, fname, 'node'),
356356
set_replication=True,
357357
initdb_params=['--data-checksums'],
358358
pg_options={
@@ -418,7 +418,7 @@ def test_replica_archive(self):
418418
fname = self.id().split('.')[3]
419419
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
420420
master = self.make_simple_node(
421-
base_dir="{0}/{1}/master".format(module_name, fname),
421+
base_dir=os.path.join(module_name, fname, 'master'),
422422
set_replication=True,
423423
initdb_params=['--data-checksums'],
424424
pg_options={
@@ -432,7 +432,7 @@ def test_replica_archive(self):
432432
master.slow_start()
433433

434434
replica = self.make_simple_node(
435-
base_dir="{0}/{1}/replica".format(module_name, fname))
435+
base_dir=os.path.join(module_name, fname, 'replica'))
436436
replica.cleanup()
437437

438438
master.psql(
@@ -481,7 +481,7 @@ def test_replica_archive(self):
481481

482482
# RESTORE FULL BACKUP TAKEN FROM replica
483483
node = self.make_simple_node(
484-
base_dir="{0}/{1}/node".format(module_name, fname))
484+
base_dir=os.path.join(module_name, fname, 'node'))
485485
node.cleanup()
486486
self.restore_node(backup_dir, 'replica', data_dir=node.data_dir)
487487
node.append_conf(
@@ -550,14 +550,14 @@ def test_master_and_replica_parallel_archiving(self):
550550
fname = self.id().split('.')[3]
551551
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
552552
master = self.make_simple_node(
553-
base_dir="{0}/{1}/master".format(module_name, fname),
553+
base_dir=os.path.join(module_name, fname, 'master'),
554554
set_replication=True,
555555
initdb_params=['--data-checksums'],
556556
pg_options={
557557
'archive_timeout': '10s'}
558558
)
559559
replica = self.make_simple_node(
560-
base_dir="{0}/{1}/replica".format(module_name, fname))
560+
base_dir=os.path.join(module_name, fname, 'replica'))
561561
replica.cleanup()
562562

563563
self.init_pb(backup_dir)
@@ -640,15 +640,15 @@ def test_master_and_replica_concurrent_archiving(self):
640640
fname = self.id().split('.')[3]
641641
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
642642
master = self.make_simple_node(
643-
base_dir="{0}/{1}/master".format(module_name, fname),
643+
base_dir=os.path.join(module_name, fname, 'master'),
644644
set_replication=True,
645645
initdb_params=['--data-checksums'],
646646
pg_options={
647647
'checkpoint_timeout': '30s',
648648
'archive_timeout': '10s'}
649649
)
650650
replica = self.make_simple_node(
651-
base_dir="{0}/{1}/replica".format(module_name, fname))
651+
base_dir=os.path.join(module_name, fname, 'replica'))
652652
replica.cleanup()
653653

654654
self.init_pb(backup_dir)
@@ -723,7 +723,7 @@ def test_archive_pg_receivexlog(self):
723723
fname = self.id().split('.')[3]
724724
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
725725
node = self.make_simple_node(
726-
base_dir="{0}/{1}/node".format(module_name, fname),
726+
base_dir=os.path.join(module_name, fname, 'node'),
727727
set_replication=True,
728728
initdb_params=['--data-checksums'],
729729
pg_options={
@@ -797,7 +797,7 @@ def test_archive_pg_receivexlog_compression_pg10(self):
797797
fname = self.id().split('.')[3]
798798
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
799799
node = self.make_simple_node(
800-
base_dir="{0}/{1}/node".format(module_name, fname),
800+
base_dir=os.path.join(module_name, fname, 'node'),
801801
set_replication=True,
802802
initdb_params=['--data-checksums'],
803803
pg_options={

‎tests/auth_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test_backup_via_unpriviledged_user(self):
3232
"""
3333
fname = self.id().split('.')[3]
3434
node = self.make_simple_node(
35-
base_dir="{0}/{1}/node".format(module_name, fname),
35+
base_dir=os.path.join(module_name, fname, 'node'),
3636
set_replication=True,
3737
initdb_params=['--data-checksums'],
3838
pg_options={

‎tests/backup_test.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test_backup_modes_archive(self):
1717
"""standart backup modes with ARCHIVE WAL method"""
1818
fname = self.id().split('.')[3]
1919
node = self.make_simple_node(
20-
base_dir="{0}/{1}/node".format(module_name, fname),
20+
base_dir=os.path.join(module_name, fname, 'node'),
2121
initdb_params=['--data-checksums'],
2222
pg_options={
2323
'wal_level': 'replica',
@@ -89,7 +89,7 @@ def test_smooth_checkpoint(self):
8989
"""full backup with smooth checkpoint"""
9090
fname = self.id().split('.')[3]
9191
node = self.make_simple_node(
92-
base_dir="{0}/{1}/node".format(module_name, fname),
92+
base_dir=os.path.join(module_name, fname, 'node'),
9393
initdb_params=['--data-checksums'],
9494
pg_options={'wal_level': 'replica'}
9595
)
@@ -113,7 +113,7 @@ def test_incremental_backup_without_full(self):
113113
"""page-level backup without validated full backup"""
114114
fname = self.id().split('.')[3]
115115
node = self.make_simple_node(
116-
base_dir="{0}/{1}/node".format(module_name, fname),
116+
base_dir=os.path.join(module_name, fname, 'node'),
117117
initdb_params=['--data-checksums'],
118118
pg_options={'wal_level': 'replica', 'ptrack_enable': 'on'}
119119
)
@@ -169,7 +169,7 @@ def test_incremental_backup_corrupt_full(self):
169169
"""page-level backup with corrupted full backup"""
170170
fname = self.id().split('.')[3]
171171
node = self.make_simple_node(
172-
base_dir="{0}/{1}/node".format(module_name, fname),
172+
base_dir=os.path.join(module_name, fname, 'node'),
173173
initdb_params=['--data-checksums'],
174174
pg_options={'wal_level': 'replica', 'ptrack_enable': 'on'}
175175
)
@@ -234,7 +234,7 @@ def test_ptrack_threads(self):
234234
"""ptrack multi thread backup mode"""
235235
fname = self.id().split('.')[3]
236236
node = self.make_simple_node(
237-
base_dir="{0}/{1}/node".format(module_name, fname),
237+
base_dir=os.path.join(module_name, fname, 'node'),
238238
initdb_params=['--data-checksums'],
239239
pg_options={'wal_level': 'replica', 'ptrack_enable': 'on'}
240240
)
@@ -262,7 +262,7 @@ def test_ptrack_threads_stream(self):
262262
"""ptrack multi thread backup mode and stream"""
263263
fname = self.id().split('.')[3]
264264
node = self.make_simple_node(
265-
base_dir="{0}/{1}/node".format(module_name, fname),
265+
base_dir=os.path.join(module_name, fname, 'node'),
266266
set_replication=True,
267267
initdb_params=['--data-checksums'],
268268
pg_options={
@@ -293,7 +293,7 @@ def test_page_corruption_heal_via_ptrack_1(self):
293293
"""make node, corrupt some page, check that backup failed"""
294294
fname = self.id().split('.')[3]
295295
node = self.make_simple_node(
296-
base_dir="{0}/{1}/node".format(module_name, fname),
296+
base_dir=os.path.join(module_name, fname, 'node'),
297297
set_replication=True,
298298
initdb_params=['--data-checksums'],
299299
pg_options={'wal_level': 'replica', 'max_wal_senders': '2'}
@@ -350,7 +350,7 @@ def test_page_corruption_heal_via_ptrack_2(self):
350350
"""make node, corrupt some page, check that backup failed"""
351351
fname = self.id().split('.')[3]
352352
node = self.make_simple_node(
353-
base_dir="{0}/{1}/node".format(module_name, fname),
353+
base_dir=os.path.join(module_name, fname, 'node'),
354354
set_replication=True,
355355
initdb_params=['--data-checksums'],
356356
pg_options={'wal_level': 'replica', 'max_wal_senders': '2'}
@@ -423,7 +423,7 @@ def test_tablespace_in_pgdata_pgpro_1376(self):
423423
"""PGPRO-1376 """
424424
fname = self.id().split('.')[3]
425425
node = self.make_simple_node(
426-
base_dir="{0}/{1}/node".format(module_name, fname),
426+
base_dir=os.path.join(module_name, fname, 'node'),
427427
set_replication=True,
428428
initdb_params=['--data-checksums'],
429429
pg_options={'wal_level': 'replica', 'max_wal_senders': '2'}

‎tests/compatibility.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def test_backward_compatibility_page(self):
1616
fname = self.id().split('.')[3]
1717
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
1818
node = self.make_simple_node(
19-
base_dir="{0}/{1}/node".format(module_name, fname),
19+
base_dir=os.path.join(module_name, fname, 'node'),
2020
set_replication=True,
2121
initdb_params=['--data-checksums'],
2222
pg_options={
@@ -47,7 +47,7 @@ def test_backward_compatibility_page(self):
4747

4848
# RESTORE old FULL with new binary
4949
node_restored = self.make_simple_node(
50-
base_dir="{0}/{1}/node_restored".format(module_name, fname))
50+
base_dir=os.path.join(module_name, fname, 'node_restored'))
5151

5252
node_restored.cleanup()
5353

@@ -116,7 +116,7 @@ def test_backward_compatibility_delta(self):
116116
fname = self.id().split('.')[3]
117117
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
118118
node = self.make_simple_node(
119-
base_dir="{0}/{1}/node".format(module_name, fname),
119+
base_dir=os.path.join(module_name, fname, 'node'),
120120
set_replication=True,
121121
initdb_params=['--data-checksums'],
122122
pg_options={
@@ -147,7 +147,7 @@ def test_backward_compatibility_delta(self):
147147

148148
# RESTORE old FULL with new binary
149149
node_restored = self.make_simple_node(
150-
base_dir="{0}/{1}/node_restored".format(module_name, fname))
150+
base_dir=os.path.join(module_name, fname, 'node_restored'))
151151

152152
node_restored.cleanup()
153153

@@ -216,7 +216,7 @@ def test_backward_compatibility_ptrack(self):
216216
fname = self.id().split('.')[3]
217217
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
218218
node = self.make_simple_node(
219-
base_dir="{0}/{1}/node".format(module_name, fname),
219+
base_dir=os.path.join(module_name, fname, 'node'),
220220
set_replication=True,
221221
initdb_params=['--data-checksums'],
222222
pg_options={
@@ -247,7 +247,7 @@ def test_backward_compatibility_ptrack(self):
247247

248248
# RESTORE old FULL with new binary
249249
node_restored = self.make_simple_node(
250-
base_dir="{0}/{1}/node_restored".format(module_name, fname))
250+
base_dir=os.path.join(module_name, fname, 'node_restored'))
251251

252252
node_restored.cleanup()
253253

@@ -316,7 +316,7 @@ def test_backward_compatibility_compression(self):
316316
fname = self.id().split('.')[3]
317317
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
318318
node = self.make_simple_node(
319-
base_dir="{0}/{1}/node".format(module_name, fname),
319+
base_dir=os.path.join(module_name, fname, 'node'),
320320
set_replication=True,
321321
initdb_params=['--data-checksums'],
322322
pg_options={
@@ -342,7 +342,7 @@ def test_backward_compatibility_compression(self):
342342

343343
# restore OLD FULL with new binary
344344
node_restored = self.make_simple_node(
345-
base_dir="{0}/{1}/node_restored".format(module_name, fname))
345+
base_dir=os.path.join(module_name, fname, 'node_restored'))
346346

347347
node_restored.cleanup()
348348

‎tests/compression.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def test_compression_stream_zlib(self):
1818
fname = self.id().split('.')[3]
1919
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
2020
node = self.make_simple_node(
21-
base_dir="{0}/{1}/node".format(module_name, fname),
21+
base_dir=os.path.join(module_name, fname, 'node'),
2222
set_replication=True,
2323
initdb_params=['--data-checksums'],
2424
pg_options={
@@ -131,7 +131,7 @@ def test_compression_archive_zlib(self):
131131
fname = self.id().split('.')[3]
132132
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
133133
node = self.make_simple_node(
134-
base_dir="{0}/{1}/node".format(module_name, fname),
134+
base_dir=os.path.join(module_name, fname, 'node'),
135135
set_replication=True,
136136
initdb_params=['--data-checksums'],
137137
pg_options={
@@ -238,7 +238,7 @@ def test_compression_stream_pglz(self):
238238
fname = self.id().split('.')[3]
239239
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
240240
node = self.make_simple_node(
241-
base_dir="{0}/{1}/node".format(module_name, fname),
241+
base_dir=os.path.join(module_name, fname, 'node'),
242242
set_replication=True,
243243
initdb_params=['--data-checksums'],
244244
pg_options={
@@ -348,7 +348,7 @@ def test_compression_archive_pglz(self):
348348
fname = self.id().split('.')[3]
349349
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
350350
node = self.make_simple_node(
351-
base_dir="{0}/{1}/node".format(module_name, fname),
351+
base_dir=os.path.join(module_name, fname, 'node'),
352352
set_replication=True,
353353
initdb_params=['--data-checksums'],
354354
pg_options={
@@ -458,7 +458,7 @@ def test_compression_wrong_algorithm(self):
458458
fname = self.id().split('.')[3]
459459
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
460460
node = self.make_simple_node(
461-
base_dir="{0}/{1}/node".format(module_name, fname),
461+
base_dir=os.path.join(module_name, fname, 'node'),
462462
set_replication=True,
463463
initdb_params=['--data-checksums'],
464464
pg_options={
@@ -503,7 +503,7 @@ def test_uncompressable_pages(self):
503503
fname = self.id().split('.')[3]
504504
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
505505
node = self.make_simple_node(
506-
base_dir="{0}/{1}/node".format(module_name, fname),
506+
base_dir=os.path.join(module_name, fname, 'node'),
507507
set_replication=True,
508508
initdb_params=['--data-checksums'],
509509
pg_options={

‎tests/delete_test.py‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def test_delete_full_backups(self):
1616
"""delete full backups"""
1717
fname = self.id().split('.')[3]
1818
node = self.make_simple_node(
19-
base_dir="{0}/{1}/node".format(module_name, fname),
19+
base_dir=os.path.join(module_name, fname, 'node'),
2020
initdb_params=['--data-checksums'],
21-
pg_options={'wal_level': 'replica'}
22-
)
21+
pg_options={'wal_level': 'replica'})
22+
2323
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
2424
self.init_pb(backup_dir)
2525
self.add_instance(backup_dir, 'node', node)
@@ -64,10 +64,11 @@ def test_delete_archive_mix_compress_and_non_compressed_segments(self):
6464
def test_delete_increment_page(self):
6565
"""delete increment and all after him"""
6666
fname = self.id().split('.')[3]
67-
node = self.make_simple_node(base_dir="{0}/{1}/node".format(module_name, fname),
67+
node = self.make_simple_node(
68+
base_dir=os.path.join(module_name, fname, 'node'),
6869
initdb_params=['--data-checksums'],
69-
pg_options={'wal_level': 'replica'}
70-
)
70+
pg_options={'wal_level': 'replica'})
71+
7172
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
7273
self.init_pb(backup_dir)
7374
self.add_instance(backup_dir, 'node', node)
@@ -104,10 +105,11 @@ def test_delete_increment_page(self):
104105
def test_delete_increment_ptrack(self):
105106
"""delete increment and all after him"""
106107
fname = self.id().split('.')[3]
107-
node = self.make_simple_node(base_dir="{0}/{1}/node".format(module_name, fname),
108+
node = self.make_simple_node(
109+
base_dir=os.path.join(module_name, fname, 'node'),
108110
initdb_params=['--data-checksums'],
109-
pg_options={'wal_level': 'replica', 'ptrack_enable': 'on'}
110-
)
111+
pg_options={'wal_level': 'replica', 'ptrack_enable': 'on'})
112+
111113
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
112114
self.init_pb(backup_dir)
113115
self.add_instance(backup_dir, 'node', node)
@@ -144,10 +146,11 @@ def test_delete_increment_ptrack(self):
144146
def test_delete_orphaned_wal_segments(self):
145147
"""make archive node, make three full backups, delete second backup without --wal option, then delete orphaned wals via --wal option"""
146148
fname = self.id().split('.')[3]
147-
node = self.make_simple_node(base_dir="{0}/{1}/node".format(module_name, fname),
149+
node = self.make_simple_node(
150+
base_dir=os.path.join(module_name, fname, 'node'),
148151
initdb_params=['--data-checksums'],
149-
pg_options={'wal_level': 'replica'}
150-
)
152+
pg_options={'wal_level': 'replica'})
153+
151154
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
152155
self.init_pb(backup_dir)
153156
self.add_instance(backup_dir, 'node', node)

0 commit comments

Comments
 (0)