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

kulaginm · kulaginm · commit 161f64c7ded4 · 2021-10-12T19:32:21.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -55,13 +55,13 @@ env:
     - PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=checkdb
     - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=checkdb
     - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=checkdb
-#    - PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=restore
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=restore
-#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=restore
-#    - PG_VERSION=11 PG_BRANCH=REL_11_STABLE MODE=restore
-#    - PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=restore
-#    - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=restore
-#    - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=restore
+    - PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=restore
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=restore
+    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=restore
+    - PG_VERSION=11 PG_BRANCH=REL_11_STABLE MODE=restore
+    - PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=restore
+    - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=restore
+    - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=restore
 #    - PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=ptrack
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=ptrack
 #    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=ptrack
diff --git a/tests/restore.py b/tests/restore.py
@@ -4,7 +4,7 @@
 import subprocess
 import sys
 from time import sleep
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 import hashlib
 import shutil
 import json
@@ -2140,7 +2140,8 @@ def test_restore_target_new_options(self):
 
         target_name = 'savepoint'
 
-        target_time = datetime.now().astimezone().strftime("%Y-%m-%d %H:%M:%S %z")
+        # in python-3.6+ it can be ...now()..astimezone()...
+        target_time = datetime.utcnow().replace(tzinfo=timezone.utc).astimezone().strftime("%Y-%m-%d %H:%M:%S %z")
         with node.connect("postgres") as con:
             res = con.execute(
                 "INSERT INTO tbl0005 VALUES ('inserted') RETURNING (xmin)")
@@ -2509,7 +2510,7 @@ def test_partial_restore_exclude(self):
 
         db_list = {}
         for line in db_list_splitted:
-            line = json.loads(line)
+            line = json.loads(line.decode('utf-8'))
             db_list[line['datname']] = line['oid']
 
         # FULL backup
@@ -2640,7 +2641,7 @@ def test_partial_restore_exclude_tablespace(self):
 
         db_list = {}
         for line in db_list_splitted:
-            line = json.loads(line)
+            line = json.loads(line.decode('utf-8'))
             db_list[line['datname']] = line['oid']
 
         # FULL backup
