Commit161f64c

committed

[PGPRO-5673] adapt tests/restore.py to Python-3.5 (used in travis tests)

1 parentce33c9d commit161f64cCopy full SHA for 161f64c

File tree

+12

-11

lines changed

+12

-11

lines changed

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,13 +55,13 @@ env:`
`55`	`55`	`-PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=checkdb`
`56`	`56`	`-PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=checkdb`
`57`	`57`	`-PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=checkdb`
`58`		`-# - PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=restore`
`59`		`-# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=restore`
`60`		`-# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=restore`
`61`		`-# - PG_VERSION=11 PG_BRANCH=REL_11_STABLE MODE=restore`
`62`		`-# - PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=restore`
`63`		`-# - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=restore`
`64`		`-# - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=restore`
	`58`	`+ -PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=restore`
	`59`	`+ -PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=restore`
	`60`	`+ -PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=restore`
	`61`	`+ -PG_VERSION=11 PG_BRANCH=REL_11_STABLE MODE=restore`
	`62`	`+ -PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=restore`
	`63`	`+ -PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=restore`
	`64`	`+ -PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=restore`
`65`	`65`	`# - PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=ptrack`
`66`	`66`	`# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=ptrack`
`67`	`67`	`# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=ptrack`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`importsubprocess`
`5`	`5`	`importsys`
`6`	`6`	`fromtimeimportsleep`
`7`		`-fromdatetimeimportdatetime,timedelta`
	`7`	`+fromdatetimeimportdatetime,timedelta,timezone`
`8`	`8`	`importhashlib`
`9`	`9`	`importshutil`
`10`	`10`	`importjson`
`@@ -2140,7 +2140,8 @@ def test_restore_target_new_options(self):`
`2140`	`2140`
`2141`	`2141`	`target_name='savepoint'`
`2142`	`2142`
`2143`		`-target_time=datetime.now().astimezone().strftime("%Y-%m-%d %H:%M:%S %z")`
	`2143`	`+# in python-3.6+ it can be ...now()..astimezone()...`
	`2144`	`+target_time=datetime.utcnow().replace(tzinfo=timezone.utc).astimezone().strftime("%Y-%m-%d %H:%M:%S %z")`
`2144`	`2145`	`withnode.connect("postgres")ascon:`
`2145`	`2146`	`res=con.execute(`
`2146`	`2147`	`"INSERT INTO tbl0005 VALUES ('inserted') RETURNING (xmin)")`
`@@ -2509,7 +2510,7 @@ def test_partial_restore_exclude(self):`
`2509`	`2510`
`2510`	`2511`	`db_list= {}`
`2511`	`2512`	`forlineindb_list_splitted:`
`2512`		`-line=json.loads(line)`
	`2513`	`+line=json.loads(line.decode('utf-8'))`
`2513`	`2514`	`db_list[line['datname']]=line['oid']`
`2514`	`2515`
`2515`	`2516`	`# FULL backup`
`@@ -2640,7 +2641,7 @@ def test_partial_restore_exclude_tablespace(self):`
`2640`	`2641`
`2641`	`2642`	`db_list= {}`
`2642`	`2643`	`forlineindb_list_splitted:`
`2643`		`-line=json.loads(line)`
	`2644`	`+line=json.loads(line.decode('utf-8'))`
`2644`	`2645`	`db_list[line['datname']]=line['oid']`
`2645`	`2646`
`2646`	`2647`	`# FULL backup`

Comments

(0)