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

Commitdcbcc77

Browse files
committed
[PGPRO-5673] adapt#2 tests/restore.py to Python-3.5 (used in travis tests)
1 parent161f64c commitdcbcc77

File tree

3 files changed

+15
-36
lines changed

3 files changed

+15
-36
lines changed

‎.travis.yml‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,13 @@ env:
3434
# - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
3535
# - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
3636

37-
# - PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=auth_test
38-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=auth_test
39-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=auth_test
40-
# - PG_VERSION=11 PG_BRANCH=REL_11_STABLE MODE=auth_test
41-
# - PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=auth_test
42-
# - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=auth_test
43-
# - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=auth_test
44-
# - PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=backup
45-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=backup
46-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=backup
47-
# - PG_VERSION=11 PG_BRANCH=REL_11_STABLE MODE=backup
48-
# - PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=backup
49-
# - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=backup
50-
# - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=backup
51-
-PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=checkdb
52-
-PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=checkdb
53-
-PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=checkdb
54-
-PG_VERSION=11 PG_BRANCH=REL_11_STABLE MODE=checkdb
55-
-PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=checkdb
56-
-PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=checkdb
57-
-PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=checkdb
37+
-PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=backup
38+
-PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=backup
39+
-PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=backup
40+
-PG_VERSION=11 PG_BRANCH=REL_11_STABLE MODE=backup
41+
-PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=backup
42+
-PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=backup
43+
-PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=backup
5844
-PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=restore
5945
-PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=restore
6046
-PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=restore

‎tests/backup.py‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3255,10 +3255,7 @@ def test_missing_replication_permission(self):
32553255
ifProbackupTest.enterprise:
32563256
node.safe_psql(
32573257
"backupdb",
3258-
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup")
3259-
3260-
node.safe_psql(
3261-
"backupdb",
3258+
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; "
32623259
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup")
32633260

32643261
sleep(2)
@@ -3324,7 +3321,7 @@ def test_missing_replication_permission_1(self):
33243321
ifself.get_version(node)<90600:
33253322
node.safe_psql(
33263323
'backupdb',
3327-
"CREATE ROLE backup WITH LOGIN; "
3324+
"CREATE ROLE backup WITH LOGIN REPLICATION; "
33283325
"GRANT CONNECT ON DATABASE backupdb to backup; "
33293326
"GRANT USAGE ON SCHEMA pg_catalog TO backup; "
33303327
"GRANT SELECT ON TABLE pg_catalog.pg_proc TO backup; "
@@ -3383,16 +3380,12 @@ def test_missing_replication_permission_1(self):
33833380
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_wal() TO backup; "
33843381
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
33853382
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
3386-
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
3387-
)
3383+
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
33883384

33893385
ifProbackupTest.enterprise:
33903386
node.safe_psql(
33913387
"backupdb",
3392-
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup")
3393-
3394-
node.safe_psql(
3395-
"backupdb",
3388+
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; "
33963389
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup")
33973390

33983391
replica.promote()

‎tests/restore.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2504,13 +2504,13 @@ def test_partial_restore_exclude(self):
25042504
db_list_raw=node.safe_psql(
25052505
'postgres',
25062506
'SELECT to_json(a) '
2507-
'FROM (SELECT oid, datname FROM pg_database) a').rstrip()
2507+
'FROM (SELECT oid, datname FROM pg_database) a').decode('utf-8').rstrip()
25082508

25092509
db_list_splitted=db_list_raw.splitlines()
25102510

25112511
db_list= {}
25122512
forlineindb_list_splitted:
2513-
line=json.loads(line.decode('utf-8'))
2513+
line=json.loads(line)
25142514
db_list[line['datname']]=line['oid']
25152515

25162516
# FULL backup
@@ -2641,7 +2641,7 @@ def test_partial_restore_exclude_tablespace(self):
26412641

26422642
db_list= {}
26432643
forlineindb_list_splitted:
2644-
line=json.loads(line.decode('utf-8'))
2644+
line=json.loads(line)
26452645
db_list[line['datname']]=line['oid']
26462646

26472647
# FULL backup
@@ -2743,7 +2743,7 @@ def test_partial_restore_include(self):
27432743
db_list_raw=node.safe_psql(
27442744
'postgres',
27452745
'SELECT to_json(a) '
2746-
'FROM (SELECT oid, datname FROM pg_database) a').rstrip()
2746+
'FROM (SELECT oid, datname FROM pg_database) a').decode('utf-8').rstrip()
27472747

27482748
db_list_splitted=db_list_raw.splitlines()
27492749

0 commit comments

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