commit fab25a177e44ec6b841f1c60cdea0f680769f97e
from: Andrey Bille <a.bille@postgrespro.ru>
date: Tue Oct 26 07:28:47 2021 UTC

Merge branch 'master' into 'master'

Temporary workaround for https://github.com/postgrespro/pg_probackup/pull/447

See merge request automation/pg-tests!1366

commit - 945146fc05b33aad641375be677addc98c4ba95b
commit + fab25a177e44ec6b841f1c60cdea0f680769f97e
blob - /dev/null
blob + 4903056cea378a0f839702765ca860f4a1d74e9c (mode 644)
--- /dev/null
+++ patches/pg_probackup_py2_compat.patch
@@ -0,0 +1,17 @@
+diff --git a/tests/restore.py b/tests/restore.py
+index 47419e5a..b3d4aef7 100644
+--- a/tests/restore.py
++++ b/tests/restore.py
+@@ -4,7 +4,11 @@ from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
+ import subprocess
+ import sys
+ from time import sleep
+-from datetime import datetime, timedelta, timezone
++from datetime import datetime, timedelta
++try:
++    from datetime import timezone
++except ImportError:  # py2compat
++    from pytz import timezone
+ import hashlib
+ import shutil
+ import json
blob - 64dd276622af8c971fd898d2272fbc6c196206d3
blob + be0a902682752d0dacc8d6e8c4c5b7bc44910531
--- tests_install/requirements2.txt
+++ tests_install/requirements2.txt
@@ -9,3 +9,4 @@ pytest-json==0.4.0
 enum34==1.1.6
 testgres==1.8.2
 pathlib
+pytz
blob - a807144bb00098290f106502bd9385c8ca0cc94d
blob + 0ce163387b16cf0bedc288880b2d14703b76f311
--- tests_install/test_pgprobackup.py
+++ tests_install/test_pgprobackup.py
@@ -194,6 +194,13 @@ class TestPgprobackup():
                               os.path.join(dir, 'tests', 'helpers',
                                            'ptrack_helpers.py'),
                               shell=True)
+        # https://github.com/postgrespro/pg_probackup/pull/447
+        if sys.version_info < (3, 0):
+            self.pginst.os.install_package('patch')
+            subprocess.check_call(
+                "patch -p1 -i ../patches/pg_probackup_py2_compat.patch",
+                shell=True, cwd=dir
+            )
         self.fix_permissions(dir)
         # PGPRO-4108 wait ptrack2.0 in 10
         cmd = "%s sh -c 'PG_CONFIG=\"%s/pg_config\"" \