Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbebdef6

Browse files
committed
tests: fixes
1 parentf7313c1 commitbebdef6

File tree

6 files changed

+22
-4
lines changed

6 files changed

+22
-4
lines changed

‎tests/archive.py‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1157,6 +1157,11 @@ def test_archive_catalog(self):
11571157
'checkpoint_timeout':'30s',
11581158
'autovacuum':'off'})
11591159

1160+
ifself.get_version(master)<self.version_to_num('9.6.0'):
1161+
self.del_test_dir(module_name,fname)
1162+
returnunittest.skip(
1163+
'Skipped because backup from replica is not supported in PG 9.5')
1164+
11601165
self.init_pb(backup_dir)
11611166
self.add_instance(backup_dir,'master',master)
11621167
self.set_archiving(backup_dir,'master',master)
@@ -2145,6 +2150,11 @@ def test_archive_get_batching_sanity(self):
21452150
initdb_params=['--data-checksums'],
21462151
pg_options={'autovacuum':'off'})
21472152

2153+
ifself.get_version(node)<self.version_to_num('9.6.0'):
2154+
self.del_test_dir(module_name,fname)
2155+
returnunittest.skip(
2156+
'Skipped because backup from replica is not supported in PG 9.5')
2157+
21482158
self.init_pb(backup_dir)
21492159
self.add_instance(backup_dir,'node',node)
21502160
self.set_archiving(backup_dir,'node',node)
@@ -2321,7 +2331,7 @@ def test_archive_get_prefetch_corruption(self):
23212331
os.remove(os.path.join(replica.logs_dir,'postgresql.log'))
23222332
replica.slow_start(replica=True)
23232333

2324-
sleep(10)
2334+
sleep(60)
23252335

23262336
withopen(os.path.join(replica.logs_dir,'postgresql.log'),'r')asf:
23272337
postgres_log_content=f.read()

‎tests/backup.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2718,6 +2718,7 @@ def test_note_sanity(self):
27182718
backup_dir=os.path.join(self.tmp_path,module_name,fname,'backup')
27192719
node=self.make_simple_node(
27202720
base_dir=os.path.join(module_name,fname,'node'),
2721+
set_replication=True,
27212722
initdb_params=['--data-checksums'])
27222723

27232724
self.init_pb(backup_dir)

‎tests/helpers/ptrack_helpers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ def make_simple_node(
340340

341341
# set major version
342342
withopen(os.path.join(node.data_dir,'PG_VERSION'))asf:
343-
node.major_version=str(f.read().rstrip())
343+
node.major_version=float(str(f.read().rstrip()))
344344

345345
# Sane default parameters
346346
options= {}

‎tests/page.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,8 @@ def test_page_delete_1(self):
517517
backup_dir=os.path.join(self.tmp_path,module_name,fname,'backup')
518518
node=self.make_simple_node(
519519
base_dir=os.path.join(module_name,fname,'node'),
520-
set_replication=True,initdb_params=['--data-checksums'],
520+
set_replication=True,
521+
initdb_params=['--data-checksums'],
521522
pg_options={
522523
'checkpoint_timeout':'30s',
523524
'autovacuum':'off'
@@ -925,10 +926,13 @@ def test_page_backup_with_alien_wal_segment(self):
925926
fname=self.id().split('.')[3]
926927
node=self.make_simple_node(
927928
base_dir=os.path.join(module_name,fname,'node'),
929+
set_replication=True,
928930
initdb_params=['--data-checksums'])
929931

930932
alien_node=self.make_simple_node(
931-
base_dir=os.path.join(module_name,fname,'alien_node'))
933+
base_dir=os.path.join(module_name,fname,'alien_node'),
934+
set_replication=True,
935+
initdb_params=['--data-checksums'])
932936

933937
backup_dir=os.path.join(self.tmp_path,module_name,fname,'backup')
934938
self.init_pb(backup_dir)

‎tests/replica.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,6 +1333,8 @@ def test_replica_promote_archive_delta(self):
13331333
node1.promote()
13341334
node1.safe_psql('postgres','CHECKPOINT')
13351335

1336+
sleep(5)
1337+
13361338
# delta backup on timeline 3
13371339
self.backup_node(
13381340
backup_dir,'node',node1,node1.data_dir,'delta',

‎tests/set_backup.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@ def test_add_big_note(self):
426426
fname=self.id().split('.')[3]
427427
node=self.make_simple_node(
428428
base_dir=os.path.join(module_name,fname,'node'),
429+
set_replication=True,
429430
initdb_params=['--data-checksums'])
430431

431432
backup_dir=os.path.join(self.tmp_path,module_name,fname,'backup')

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp