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

Commit64d0443

Browse files
committed
tests: add property pg_config_version
1 parent420a527 commit64d0443

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎tests/backup.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,6 +1050,9 @@ def test_backup_concurrent_drop_table(self):
10501050
# @unittest.skip("skip")
10511051
deftest_pg_11_adjusted_wal_segment_size(self):
10521052
""""""
1053+
ifself.pg_config_version<self.version_to_num('11.0'):
1054+
returnunittest.skip('You need PostgreSQL >= 11 for this test')
1055+
10531056
fname=self.id().split('.')[3]
10541057
backup_dir=os.path.join(self.tmp_path,module_name,fname,'backup')
10551058
node=self.make_simple_node(
@@ -1067,9 +1070,6 @@ def test_pg_11_adjusted_wal_segment_size(self):
10671070
self.set_archiving(backup_dir,'node',node)
10681071
node.slow_start()
10691072

1070-
ifself.get_version(node)<self.version_to_num('11.0'):
1071-
returnunittest.skip('You need PostgreSQL >= 11 for this test')
1072-
10731073
node.pgbench_init(scale=5)
10741074

10751075
# FULL STREAM backup
@@ -1119,8 +1119,6 @@ def test_pg_11_adjusted_wal_segment_size(self):
11191119
'--delete-wal',
11201120
'--retention-redundancy=1'])
11211121

1122-
print(output)
1123-
11241122
# validate
11251123
self.validate_pb(backup_dir)
11261124

‎tests/checkdb.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -466,11 +466,6 @@ def test_checkdb_sigint_handling(self):
466466
"postgres",
467467
"create extension amcheck_next")
468468

469-
# truncate log_file
470-
#with open(node.pg_log_file, 'w') as f:
471-
# f.truncate()
472-
# f.close()
473-
474469
# FULL backup
475470
gdb=self.checkdb_node(
476471
backup_dir,'node',gdb=True,
@@ -482,7 +477,7 @@ def test_checkdb_sigint_handling(self):
482477
gdb.set_breakpoint('amcheck_one_index')
483478
gdb.run_until_break()
484479

485-
gdb.continue_execution_until_break(4)
480+
gdb.continue_execution_until_break(10)
486481
gdb.remove_all_breakpoints()
487482

488483
gdb._execute('signal SIGINT')

‎tests/delta.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -928,8 +928,6 @@ def test_alter_database_set_tablespace_delta(self):
928928
set_replication=True,
929929
initdb_params=['--data-checksums'],
930930
pg_options={
931-
'max_wal_senders':'2',
932-
'checkpoint_timeout':'30s',
933931
'autovacuum':'off'
934932
}
935933
)

‎tests/helpers/ptrack_helpers.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,11 @@ def __init__(self, *args, **kwargs):
274274
if'PGPROBACKUP_SSH_REMOTE'inself.test_env:
275275
self.remote=True
276276

277+
@property
278+
defpg_config_version(self):
279+
returnself.version_to_num(
280+
testgres.get_pg_config()['VERSION'].split(" ")[1])
281+
277282
# if 'PGPROBACKUP_SSH_HOST' in self.test_env:
278283
# self.remote_host = self.test_env['PGPROBACKUP_SSH_HOST']
279284
# else

‎tests/restore.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2159,6 +2159,9 @@ def test_pg_11_group_access(self):
21592159
"""
21602160
test group access for PG >= 11
21612161
"""
2162+
ifself.pg_config_version<self.version_to_num('11.0'):
2163+
returnunittest.skip('You need PostgreSQL >= 11 for this test')
2164+
21622165
fname=self.id().split('.')[3]
21632166
node=self.make_simple_node(
21642167
base_dir=os.path.join(module_name,fname,'node'),
@@ -2172,9 +2175,6 @@ def test_pg_11_group_access(self):
21722175
self.add_instance(backup_dir,'node',node)
21732176
node.slow_start()
21742177

2175-
ifself.get_version(node)<self.version_to_num('11.0'):
2176-
returnunittest.skip('You need PostgreSQL >= 11 for this test')
2177-
21782178
# take FULL backup
21792179
self.backup_node(backup_dir,'node',node,options=['--stream'])
21802180

@@ -2200,6 +2200,9 @@ def test_pg_10_waldir(self):
22002200
"""
22012201
test group access for PG >= 11
22022202
"""
2203+
ifself.pg_config_version<self.version_to_num('10.0'):
2204+
returnunittest.skip('You need PostgreSQL >= 10 for this test')
2205+
22032206
fname=self.id().split('.')[3]
22042207
wal_dir=os.path.join(
22052208
os.path.join(self.tmp_path,module_name,fname),'wal_dir')
@@ -2216,9 +2219,6 @@ def test_pg_10_waldir(self):
22162219
self.add_instance(backup_dir,'node',node)
22172220
node.slow_start()
22182221

2219-
ifself.get_version(node)<self.version_to_num('10.0'):
2220-
returnunittest.skip('You need PostgreSQL >= 10 for this test')
2221-
22222222
# take FULL backup
22232223
self.backup_node(
22242224
backup_dir,'node',node,options=['--stream'])
@@ -2335,7 +2335,11 @@ def test_lost_non_data_file(self):
23352335
self.output,self.cmd))
23362336
exceptProbackupExceptionase:
23372337
self.assertIn(
2338-
'Insert correct error message',e.message,
2338+
'is not found',e.message,
2339+
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
2340+
repr(e.message),self.cmd))
2341+
self.assertIn(
2342+
'ERROR: Data files restoring failed',e.message,
23392343
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
23402344
repr(e.message),self.cmd))
23412345

0 commit comments

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