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

Commiteba5a47

Browse files
committed
fix tests for postgresql-11 with ptrack-2
1 parent406d82c commiteba5a47

File tree

4 files changed

+23
-57
lines changed

4 files changed

+23
-57
lines changed

‎tests/backup.py‎

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_backup_modes_archive(self):
3333
self.set_archiving(backup_dir,'node',node)
3434
node.slow_start()
3535

36-
ifnode.major_version>=12:
36+
ifnode.major_version>=11:
3737
node.safe_psql(
3838
"postgres",
3939
"CREATE EXTENSION ptrack")
@@ -134,7 +134,7 @@ def test_incremental_backup_without_full(self):
134134
self.set_archiving(backup_dir,'node',node)
135135
node.slow_start()
136136

137-
ifnode.major_version>=12:
137+
ifnode.major_version>=11:
138138
node.safe_psql(
139139
"postgres",
140140
"CREATE EXTENSION ptrack")
@@ -259,7 +259,7 @@ def test_ptrack_threads(self):
259259
self.set_archiving(backup_dir,'node',node)
260260
node.slow_start()
261261

262-
ifnode.major_version>=12:
262+
ifnode.major_version>=11:
263263
node.safe_psql(
264264
"postgres",
265265
"CREATE EXTENSION ptrack")
@@ -295,7 +295,7 @@ def test_ptrack_threads_stream(self):
295295
self.add_instance(backup_dir,'node',node)
296296
node.slow_start()
297297

298-
ifnode.major_version>=12:
298+
ifnode.major_version>=11:
299299
node.safe_psql(
300300
"postgres",
301301
"CREATE EXTENSION ptrack")
@@ -1478,7 +1478,7 @@ def test_drop_rel_during_backup_ptrack(self):
14781478
self.set_archiving(backup_dir,'node',node)
14791479
node.slow_start()
14801480

1481-
ifnode.major_version>=12:
1481+
ifnode.major_version>=11:
14821482
node.safe_psql(
14831483
"postgres",
14841484
"CREATE EXTENSION ptrack")
@@ -1992,10 +1992,11 @@ def test_backup_with_least_privileges_role(self):
19921992
'postgres',
19931993
'CREATE DATABASE backupdb')
19941994

1995-
ifself.ptrackandnode.major_version>=12:
1995+
ifself.ptrackandnode.major_version>=11:
19961996
node.safe_psql(
19971997
"backupdb",
1998-
"CREATE EXTENSION ptrack WITH SCHEMA pg_catalog")
1998+
"CREATE SCHEMA ptrack; "
1999+
"CREATE EXTENSION ptrack WITH SCHEMA ptrack")
19992000

20002001
# PG 9.5
20012002
ifself.get_version(node)<90600:
@@ -2105,33 +2106,23 @@ def test_backup_with_least_privileges_role(self):
21052106
)
21062107

21072108
ifself.ptrack:
2108-
ifnode.major_version<12:
2109-
# Reviewer, NB: skip this test in case of old ptrack?
2110-
forfnamein [
2111-
'pg_catalog.oideq(oid, oid)',
2112-
'pg_catalog.ptrack_version()',
2113-
'pg_catalog.pg_ptrack_clear()',
2114-
'pg_catalog.pg_ptrack_control_lsn()',
2115-
'pg_catalog.pg_ptrack_get_and_clear_db(oid, oid)',
2116-
'pg_catalog.pg_ptrack_get_and_clear(oid, oid)',
2117-
'pg_catalog.pg_ptrack_get_block_2(oid, oid, oid, bigint)',
2118-
'pg_catalog.pg_stop_backup()']:
2119-
2120-
node.safe_psql(
2121-
"backupdb",
2122-
"GRANT EXECUTE ON FUNCTION {0} "
2123-
"TO backup".format(fname))
2124-
else:
2109+
ifnode.major_version>=11:
21252110
fnames= [
2126-
'pg_catalog.ptrack_get_pagemapset(pg_lsn)',
2127-
'pg_catalog.ptrack_init_lsn()'
2111+
'ptrack.ptrack_get_pagemapset(pg_lsn)',
2112+
'ptrack.ptrack_init_lsn()'
21282113
]
21292114

2115+
node.safe_psql(
2116+
"backupdb",
2117+
"GRANT USAGE ON SCHEMA ptrack TO backup")
2118+
21302119
forfnameinfnames:
21312120
node.safe_psql(
21322121
"backupdb",
21332122
"GRANT EXECUTE ON FUNCTION {0} "
21342123
"TO backup".format(fname))
2124+
else:
2125+
self.skipTest("skip --- we do not support ptrack 1.* anymore")
21352126

21362127
ifProbackupTest.enterprise:
21372128
node.safe_psql(
@@ -2391,7 +2382,7 @@ def test_backup_with_less_privileges_role(self):
23912382
'postgres',
23922383
'CREATE DATABASE backupdb')
23932384

2394-
ifself.ptrackandnode.major_version>=12:
2385+
ifself.ptrackandnode.major_version>=11:
23952386
node.safe_psql(
23962387
'backupdb',
23972388
'CREATE EXTENSION ptrack')

‎tests/helpers/ptrack_helpers.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ def make_simple_node(
386386
options['ptrack.map_size']='128'
387387
options['shared_preload_libraries']='ptrack'
388388
else:
389+
# Hmm... throw error here?
389390
options['ptrack_enable']='on'
390391

391392
ifnode.major_version>=13:

‎tests/ptrack.py‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -481,24 +481,7 @@ def test_ptrack_unprivileged(self):
481481
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
482482
)
483483

484-
ifnode.major_version<11:
485-
# Reviewer, NB: skip this test in case of old ptrack?
486-
self.fnames= [
487-
'pg_catalog.oideq(oid, oid)',
488-
'pg_catalog.ptrack_version()',
489-
'pg_catalog.pg_ptrack_clear()',
490-
'pg_catalog.pg_ptrack_control_lsn()',
491-
'pg_catalog.pg_ptrack_get_and_clear_db(oid, oid)',
492-
'pg_catalog.pg_ptrack_get_and_clear(oid, oid)',
493-
'pg_catalog.pg_ptrack_get_block_2(oid, oid, oid, bigint)'
494-
]
495-
496-
forself.fnameinself.fnames:
497-
node.safe_psql(
498-
"backupdb",
499-
"GRANT EXECUTE ON FUNCTION {0} TO backup".format(fname))
500-
501-
else:
484+
ifnode.major_version>=11:
502485
node.safe_psql(
503486
"backupdb",
504487
"CREATE SCHEMA ptrack")

‎tests/restore.py‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3298,18 +3298,7 @@ def test_missing_database_map(self):
32983298

32993299
ifself.ptrack:
33003300
fnames= []
3301-
ifnode.major_version<12:
3302-
# Reviewer, NB: skip this test in case of old ptrack?
3303-
fnames+= [
3304-
'pg_catalog.oideq(oid, oid)',
3305-
'pg_catalog.ptrack_version()',
3306-
'pg_catalog.pg_ptrack_clear()',
3307-
'pg_catalog.pg_ptrack_control_lsn()',
3308-
'pg_catalog.pg_ptrack_get_and_clear_db(oid, oid)',
3309-
'pg_catalog.pg_ptrack_get_and_clear(oid, oid)',
3310-
'pg_catalog.pg_ptrack_get_block_2(oid, oid, oid, bigint)'
3311-
]
3312-
else:
3301+
ifnode.major_version>=11:
33133302
# TODO why backup works without these grants ?
33143303
# fnames += [
33153304
# 'pg_ptrack_get_pagemapset(pg_lsn)',
@@ -3318,6 +3307,8 @@ def test_missing_database_map(self):
33183307
node.safe_psql(
33193308
"backupdb",
33203309
"CREATE EXTENSION ptrack WITH SCHEMA pg_catalog")
3310+
else:
3311+
self.skipTest("skip --- we do not support ptrack 1.* anymore")
33213312

33223313
forfnameinfnames:
33233314
node.safe_psql(

0 commit comments

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