Merge branch 'master' into abs-backup-path

asavchkov · asavchkov · commit 071f108614a7 · 2024-02-06T14:41:33.000+07:00
diff --git a/testgres/connection.py b/testgres/connection.py
@@ -104,13 +104,13 @@ def rollback(self):
     def execute(self, query, *args):
         self.cursor.execute(query, args)
         try:
-            res = self.cursor.fetchall()
             # pg8000 might return tuples
-            if isinstance(res, tuple):
-                res = [tuple(t) for t in res]
-
+            res = [tuple(t) for t in self.cursor.fetchall()]
             return res
-        except Exception:
+        except ProgrammingError:
+            return None
+        except Exception as e:
+            print("Error executing query: {}\n {}".format(repr(e), query))
             return None
 
     def close(self):
diff --git a/testgres/plugins/__init__.py b/testgres/plugins/__init__.py
@@ -2,8 +2,7 @@
 from pg_probackup2.app import ProbackupApp, ProbackupException
 from pg_probackup2.init_helpers import init_params
 from pg_probackup2.storage.fs_backup import FSTestBackupDir
-from pg_probackup2.storage.s3_backup import S3TestBackupDir
 
 __all__ = [
-    "ProbackupApp", "ProbackupException", "init_params", "FSTestBackupDir", "S3TestBackupDir", "GDBobj"
+    "ProbackupApp", "ProbackupException", "init_params", "FSTestBackupDir", "GDBobj"
 ]
diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/app.py b/testgres/plugins/pg_probackup2/pg_probackup2/app.py
@@ -4,7 +4,6 @@
 import os
 import re
 import subprocess
-import sys
 import threading
 import time
 import unittest
@@ -37,6 +36,10 @@ def __str__(self):
         return '\n ERROR: {0}\n CMD: {1}'.format(repr(self.message), self.cmd)
 
 
+# Local backup control
+fs_backup_class = FSTestBackupDir
+
+
 class ProbackupApp:
 
     def __init__(self, test_class: unittest.TestCase,
@@ -189,15 +192,13 @@ def set_backup(self, instance, backup_id=False,
 
         return self.run(cmd + options, old_binary=old_binary, expect_error=expect_error)
 
-    def del_instance(self, instance, old_binary=False, expect_error=False):
-
-        return self.run([
-            'del-instance',
-            '--instance={0}'.format(instance),
-        ],
-            old_binary=old_binary,
-            expect_error=expect_error
-        )
+    def del_instance(self, instance, options=None, old_binary=False, expect_error=False):
+        if options is None:
+            options = []
+        cmd = ['del-instance', '--instance={0}'.format(instance)] + options
+        return self.run(cmd,
+                        old_binary=old_binary,
+                        expect_error=expect_error)
 
     def backup_node(
             self, instance, node, data_dir=False,
@@ -747,16 +748,5 @@ def load_backup_class(fs_type):
 
         return getattr(module, class_name)
 
-
-# Local or S3 backup
-fs_backup_class = FSTestBackupDir
-if os.environ.get('PG_PROBACKUP_S3_TEST', os.environ.get('PROBACKUP_S3_TYPE_FULL_TEST')):
-    root = os.path.realpath(os.path.join(os.path.dirname(__file__), '../..'))
-    if root not in sys.path:
-        sys.path.append(root)
-    from pg_probackup2.storage.s3_backup import S3TestBackupDir
-
-    fs_backup_class = S3TestBackupDir
-
     def build_backup_dir(self, backup='backup'):
         return fs_backup_class(rel_path=self.rel_path, backup=backup)
diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py b/testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py
@@ -52,6 +52,7 @@ def __init__(self):
         parts[0] = re.match(r'\d+', parts[0]).group()
         self.pg_config_version = reduce(lambda v, x: v * 100 + int(x), parts, 0)
 
+        os.environ['LANGUAGE'] = 'en'   # set default locale language to en. All messages will use this locale
         test_env = os.environ.copy()
         envs_list = [
             'LANGUAGE',
diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/storage/s3_backup.py b/testgres/plugins/pg_probackup2/pg_probackup2/storage/s3_backup.py

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@`
`2`	`2`	`from pg_probackup2.app import ProbackupApp, ProbackupException`
`3`	`3`	`from pg_probackup2.init_helpers import init_params`
`4`	`4`	`from pg_probackup2.storage.fs_backup import FSTestBackupDir`
`5`		`-from pg_probackup2.storage.s3_backup import S3TestBackupDir`
`6`	`5`
`7`	`6`	`__all__ = [`
`8`		`- "ProbackupApp", "ProbackupException", "init_params", "FSTestBackupDir", "S3TestBackupDir", "GDBobj"`
	`7`	`+ "ProbackupApp", "ProbackupException", "init_params", "FSTestBackupDir", "GDBobj"`
`9`	`8`	`]`