Skip to content

Commit 7b66795

Browse files
gsmolkgsmolk
committed
tests: windows support
1 parent f8340f5 commit 7b66795

25 files changed

+186
-185
lines changed

‎tests/archive.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ def test_archive_pg_receivexlog(self):
732732
)
733733
self.init_pb(backup_dir)
734734
self.add_instance(backup_dir, 'node', node)
735-
node.start()
735+
node.slow_start()
736736
if self.get_version(node) < 100000:
737737
pg_receivexlog_path = self.get_bin_path('pg_receivexlog')
738738
else:
@@ -806,7 +806,7 @@ def test_archive_pg_receivexlog_compression_pg10(self):
806806
)
807807
self.init_pb(backup_dir)
808808
self.add_instance(backup_dir, 'node', node)
809-
node.start()
809+
node.slow_start()
810810
if self.get_version(node) < self.version_to_num('10.0'):
811811
return unittest.skip('You need PostgreSQL 10 for this test')
812812
else:

‎tests/auth_test.py‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def test_backup_via_unpriviledged_user(self):
4343
self.init_pb(backup_dir)
4444
self.add_instance(backup_dir, 'node', node)
4545
self.set_archiving(backup_dir, 'node', node)
46-
node.start()
46+
node.slow_start()
4747

4848
node.safe_psql("postgres", "CREATE ROLE backup with LOGIN")
4949

@@ -203,25 +203,26 @@ def setUpClass(cls):
203203
cls.pb.add_instance(cls.backup_dir, cls.node.name, cls.node)
204204
cls.pb.set_archiving(cls.backup_dir, cls.node.name, cls.node)
205205
try:
206-
cls.node.start()
206+
cls.node.slow_start()
207207
except StartNodeException:
208208
raise unittest.skip("Node hasn't started")
209209

210-
cls.node.safe_psql("postgres",
211-
"CREATE ROLE backup WITH LOGIN PASSWORD 'password'; \
212-
GRANT USAGE ON SCHEMA pg_catalog TO backup; \
213-
GRANT EXECUTE ON FUNCTION current_setting(text) TO backup; \
214-
GRANT EXECUTE ON FUNCTION pg_is_in_recovery() TO backup; \
215-
GRANT EXECUTE ON FUNCTION pg_start_backup(text, boolean, boolean) TO backup; \
216-
GRANT EXECUTE ON FUNCTION pg_stop_backup() TO backup; \
217-
GRANT EXECUTE ON FUNCTION pg_stop_backup(boolean) TO backup; \
218-
GRANT EXECUTE ON FUNCTION pg_create_restore_point(text) TO backup; \
219-
GRANT EXECUTE ON FUNCTION pg_switch_xlog() TO backup; \
220-
GRANT EXECUTE ON FUNCTION txid_current() TO backup; \
221-
GRANT EXECUTE ON FUNCTION txid_current_snapshot() TO backup; \
222-
GRANT EXECUTE ON FUNCTION txid_snapshot_xmax(txid_snapshot) TO backup; \
223-
GRANT EXECUTE ON FUNCTION pg_ptrack_clear() TO backup; \
224-
GRANT EXECUTE ON FUNCTION pg_ptrack_get_and_clear(oid, oid) TO backup;")
210+
cls.node.safe_psql(
211+
"postgres",
212+
"CREATE ROLE backup WITH LOGIN PASSWORD 'password'; "
213+
"GRANT USAGE ON SCHEMA pg_catalog TO backup; "
214+
"GRANT EXECUTE ON FUNCTION current_setting(text) TO backup; "
215+
"GRANT EXECUTE ON FUNCTION pg_is_in_recovery() TO backup; "
216+
"GRANT EXECUTE ON FUNCTION pg_start_backup(text, boolean, boolean) TO backup; "
217+
"GRANT EXECUTE ON FUNCTION pg_stop_backup() TO backup; "
218+
"GRANT EXECUTE ON FUNCTION pg_stop_backup(boolean) TO backup; "
219+
"GRANT EXECUTE ON FUNCTION pg_create_restore_point(text) TO backup; "
220+
"GRANT EXECUTE ON FUNCTION pg_switch_xlog() TO backup; "
221+
"GRANT EXECUTE ON FUNCTION txid_current() TO backup; "
222+
"GRANT EXECUTE ON FUNCTION txid_current_snapshot() TO backup; "
223+
"GRANT EXECUTE ON FUNCTION txid_snapshot_xmax(txid_snapshot) TO backup; "
224+
"GRANT EXECUTE ON FUNCTION pg_ptrack_clear() TO backup; "
225+
"GRANT EXECUTE ON FUNCTION pg_ptrack_get_and_clear(oid, oid) TO backup;")
225226
cls.pgpass_file = os.path.join(os.path.expanduser('~'), '.pgpass')
226227

227228
@classmethod

‎tests/backup_test.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def test_backup_modes_archive(self):
2727
self.init_pb(backup_dir)
2828
self.add_instance(backup_dir, 'node', node)
2929
self.set_archiving(backup_dir, 'node', node)
30-
node.start()
30+
node.slow_start()
3131

3232
backup_id = self.backup_node(backup_dir, 'node', node)
3333
show_backup = self.show_pb(backup_dir, 'node')[0]
@@ -97,7 +97,7 @@ def test_smooth_checkpoint(self):
9797
self.init_pb(backup_dir)
9898
self.add_instance(backup_dir, 'node', node)
9999
self.set_archiving(backup_dir, 'node', node)
100-
node.start()
100+
node.slow_start()
101101

102102
self.backup_node(
103103
backup_dir, 'node', node,
@@ -121,7 +121,7 @@ def test_incremental_backup_without_full(self):
121121
self.init_pb(backup_dir)
122122
self.add_instance(backup_dir, 'node', node)
123123
self.set_archiving(backup_dir, 'node', node)
124-
node.start()
124+
node.slow_start()
125125

126126
try:
127127
self.backup_node(backup_dir, 'node', node, backup_type="page")
@@ -177,7 +177,7 @@ def test_incremental_backup_corrupt_full(self):
177177
self.init_pb(backup_dir)
178178
self.add_instance(backup_dir, 'node', node)
179179
self.set_archiving(backup_dir, 'node', node)
180-
node.start()
180+
node.slow_start()
181181

182182
backup_id = self.backup_node(backup_dir, 'node', node)
183183
file = os.path.join(
@@ -241,7 +241,7 @@ def test_ptrack_threads(self):
241241
self.init_pb(backup_dir)
242242
self.add_instance(backup_dir, 'node', node)
243243
self.set_archiving(backup_dir, 'node', node)
244-
node.start()
244+
node.slow_start()
245245

246246
self.backup_node(
247247
backup_dir, 'node', node,
@@ -272,7 +272,7 @@ def test_ptrack_threads_stream(self):
272272
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
273273
self.init_pb(backup_dir)
274274
self.add_instance(backup_dir, 'node', node)
275-
node.start()
275+
node.slow_start()
276276

277277
self.backup_node(
278278
backup_dir, 'node', node, backup_type="full",
@@ -301,7 +301,7 @@ def test_page_corruption_heal_via_ptrack_1(self):
301301

302302
self.init_pb(backup_dir)
303303
self.add_instance(backup_dir, 'node', node)
304-
node.start()
304+
node.slow_start()
305305

306306
self.backup_node(
307307
backup_dir, 'node', node,
@@ -358,7 +358,7 @@ def test_page_corruption_heal_via_ptrack_2(self):
358358

359359
self.init_pb(backup_dir)
360360
self.add_instance(backup_dir, 'node', node)
361-
node.start()
361+
node.slow_start()
362362

363363
self.backup_node(
364364
backup_dir, 'node', node, backup_type="full",
@@ -383,7 +383,7 @@ def test_page_corruption_heal_via_ptrack_2(self):
383383
f.write(b"bla")
384384
f.flush()
385385
f.close
386-
node.start()
386+
node.slow_start()
387387

388388
try:
389389
self.backup_node(
@@ -431,7 +431,7 @@ def test_tablespace_in_pgdata_pgpro_1376(self):
431431

432432
self.init_pb(backup_dir)
433433
self.add_instance(backup_dir, 'node', node)
434-
node.start()
434+
node.slow_start()
435435

436436
self.create_tblspace_in_node(
437437
node, 'tblspace1',

‎tests/cfs_backup.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def setUp(self):
3434
self.add_instance(self.backup_dir, 'node', self.node)
3535
self.set_archiving(self.backup_dir, 'node', self.node)
3636

37-
self.node.start()
37+
self.node.slow_start()
3838

3939
self.create_tblspace_in_node(self.node, tblspace_name, cfs=True)
4040

@@ -745,7 +745,7 @@ def test_multiple_segments(self):
745745
self.restore_node(
746746
self.backup_dir, 'node', self.node,
747747
backup_id=backup_id_full, options=["-j", "4"])
748-
self.node.start()
748+
self.node.slow_start()
749749
self.assertEqual(
750750
full_result,
751751
self.node.safe_psql("postgres", "SELECT * FROM t_heap"),
@@ -760,7 +760,7 @@ def test_multiple_segments(self):
760760
self.restore_node(
761761
self.backup_dir, 'node', self.node,
762762
backup_id=backup_id_page, options=["-j", "4"])
763-
self.node.start()
763+
self.node.slow_start()
764764
self.assertEqual(
765765
page_result,
766766
self.node.safe_psql("postgres", "SELECT * FROM t_heap"),
@@ -879,7 +879,7 @@ def test_multiple_segments_in_multiple_tablespaces(self):
879879
self.restore_node(
880880
self.backup_dir, 'node', self.node,
881881
backup_id=backup_id_full, options=["-j", "4"])
882-
self.node.start()
882+
self.node.slow_start()
883883
self.assertEqual(
884884
full_result_1,
885885
self.node.safe_psql("postgres", "SELECT * FROM t_heap_1"),
@@ -905,7 +905,7 @@ def test_multiple_segments_in_multiple_tablespaces(self):
905905
self.restore_node(
906906
self.backup_dir, 'node', self.node,
907907
backup_id=backup_id_page, options=["-j", "4"])
908-
self.node.start()
908+
self.node.slow_start()
909909
self.assertEqual(
910910
page_result_1,
911911
self.node.safe_psql("postgres", "SELECT * FROM t_heap_1"),

‎tests/cfs_restore.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def setUp(self):
4343
self.add_instance(self.backup_dir, 'node', self.node)
4444
self.set_archiving(self.backup_dir, 'node', self.node)
4545

46-
self.node.start()
46+
self.node.slow_start()
4747
self.create_tblspace_in_node(self.node, tblspace_name, cfs=True)
4848

4949
self.add_data_in_cluster()

‎tests/compression.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_compression_stream_zlib(self):
3030
self.init_pb(backup_dir)
3131
self.add_instance(backup_dir, 'node', node)
3232
self.set_archiving(backup_dir, 'node', node)
33-
node.start()
33+
node.slow_start()
3434

3535
# FULL BACKUP
3636
node.safe_psql(
@@ -142,7 +142,7 @@ def test_compression_archive_zlib(self):
142142
self.init_pb(backup_dir)
143143
self.add_instance(backup_dir, 'node', node)
144144
self.set_archiving(backup_dir, 'node', node)
145-
node.start()
145+
node.slow_start()
146146

147147
# FULL BACKUP
148148
node.safe_psql(
@@ -250,7 +250,7 @@ def test_compression_stream_pglz(self):
250250
self.init_pb(backup_dir)
251251
self.add_instance(backup_dir, 'node', node)
252252
self.set_archiving(backup_dir, 'node', node)
253-
node.start()
253+
node.slow_start()
254254

255255
# FULL BACKUP
256256
node.safe_psql(
@@ -360,7 +360,7 @@ def test_compression_archive_pglz(self):
360360
self.init_pb(backup_dir)
361361
self.add_instance(backup_dir, 'node', node)
362362
self.set_archiving(backup_dir, 'node', node)
363-
node.start()
363+
node.slow_start()
364364

365365
# FULL BACKUP
366366
node.safe_psql(
@@ -471,7 +471,7 @@ def test_compression_wrong_algorithm(self):
471471
self.init_pb(backup_dir)
472472
self.add_instance(backup_dir, 'node', node)
473473
self.set_archiving(backup_dir, 'node', node)
474-
node.start()
474+
node.slow_start()
475475

476476
try:
477477
self.backup_node(

‎tests/delete_test.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def test_delete_full_backups(self):
2424
self.init_pb(backup_dir)
2525
self.add_instance(backup_dir, 'node', node)
2626
self.set_archiving(backup_dir, 'node', node)
27-
node.start()
27+
node.slow_start()
2828

2929
# full backup
3030
self.backup_node(backup_dir, 'node', node)
@@ -72,7 +72,7 @@ def test_delete_increment_page(self):
7272
self.init_pb(backup_dir)
7373
self.add_instance(backup_dir, 'node', node)
7474
self.set_archiving(backup_dir, 'node', node)
75-
node.start()
75+
node.slow_start()
7676

7777
# full backup mode
7878
self.backup_node(backup_dir, 'node', node)
@@ -112,7 +112,7 @@ def test_delete_increment_ptrack(self):
112112
self.init_pb(backup_dir)
113113
self.add_instance(backup_dir, 'node', node)
114114
self.set_archiving(backup_dir, 'node', node)
115-
node.start()
115+
node.slow_start()
116116

117117
# full backup mode
118118
self.backup_node(backup_dir, 'node', node)
@@ -152,7 +152,7 @@ def test_delete_orphaned_wal_segments(self):
152152
self.init_pb(backup_dir)
153153
self.add_instance(backup_dir, 'node', node)
154154
self.set_archiving(backup_dir, 'node', node)
155-
node.start()
155+
node.slow_start()
156156

157157
node.safe_psql(
158158
"postgres",

0 commit comments

Comments
 (0)