Jan 18, 2024 · Nov 9, 2023 · Nov 9, 2023 · Nov 10, 2023 · Nov 21, 2023 · Jan 15, 2024
diff --git a/testgres/plugins/__init__.py b/testgres/plugins/__init__.py
 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", "S3TestBackupDir", "GDBobj"
 ]
diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/app.py b/testgres/plugins/pg_probackup2/pg_probackup2/app.py

 warning = """
 Wrong splint in show_pb
 Original Header:
 Original Header:f
 {header}
 Original Body:
 {body}
    def init(self, options=None, old_binary=False, skip_log_directory=False, expect_error=False, use_backup_dir=True):
        if options is None:
            options = []
        return self.run([
                     'init',
                 ] + options,
                 old_binary=old_binary,
                 skip_log_directory=skip_log_directory,
                 expect_error=expect_error,
                 use_backup_dir=use_backup_dir
                 )
        return self.run(['init'] + options,
                        old_binary=old_binary,
                        skip_log_directory=skip_log_directory,
                        expect_error=expect_error,
                        use_backup_dir=use_backup_dir
                        )

    def add_instance(self, instance, node, old_binary=False, options=None, expect_error=False):
        if options is None:
                        break

                if tli > 0:
                    timeline_data = None
                    for timeline in instance_timelines:
                        if timeline['tli'] == tli:
                            return timeline
                archive_command += ' --remote-proto=ssh --remote-host=localhost'

            if init_params.archive_compress and compress:
                archive_command += ' --compress-algorithm='+init_params.archive_compress
                archive_command += ' --compress-algorithm=' +init_params.archive_compress

            if overwrite:
                archive_command += ' --overwrite'
    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/storage/s3_backup.py b/testgres/plugins/pg_probackup2/pg_probackup2/storage/s3_backup.py
 from minio import Minio
 from minio.deleteobjects import DeleteObject
 import urllib3
 from .fs_backup import TestBackupDir

 root = os.path.realpath(os.path.join(os.path.dirname(__file__), '../..'))
 if root not in sys.path:
    sys.path.append(root)

 from .fs_backup import TestBackupDir

 # Should fail if either of env vars does not exist
 host = os.environ['PG_PROBACKUP_S3_HOST']
 port = os.environ['PG_PROBACKUP_S3_PORT']
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,6 @@
		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", "S3TestBackupDir", "GDBobj"
		]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,7 +17,7 @@

		warning = """
		Wrong splint in show_pb
		Original Header:
		Original Header:f
		{header}
		Original Body:
		{body}
Expand DownExpand Up		@@ -139,14 +139,12 @@ def run(self, command, gdb=False, old_binary=False, return_id=True, env=None,
		def init(self, options=None, old_binary=False, skip_log_directory=False, expect_error=False, use_backup_dir=True):
		if options is None:
		options = []
		return self.run([
		'init',
		] + options,
		old_binary=old_binary,
		skip_log_directory=skip_log_directory,
		expect_error=expect_error,
		use_backup_dir=use_backup_dir
		)
		return self.run(['init'] + options,
		old_binary=old_binary,
		skip_log_directory=skip_log_directory,
		expect_error=expect_error,
		use_backup_dir=use_backup_dir
		)

		def add_instance(self, instance, node, old_binary=False, options=None, expect_error=False):
		if options is None:
Expand DownExpand Up		@@ -545,7 +543,6 @@ def show_archive(
		break

		if tli > 0:
		timeline_data = None
		for timeline in instance_timelines:
		if timeline['tli'] == tli:
		return timeline
Expand DownExpand Up		@@ -674,7 +671,7 @@ def set_archiving(
		archive_command += ' --remote-proto=ssh --remote-host=localhost'

		if init_params.archive_compress and compress:
		archive_command += ' --compress-algorithm='+init_params.archive_compress
		archive_command += ' --compress-algorithm=' +init_params.archive_compress

		if overwrite:
		archive_command += ' --overwrite'
Expand DownExpand Up		@@ -758,8 +755,8 @@ def load_backup_class(fs_type):
		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)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,13 +6,12 @@
		from minio import Minio
		from minio.deleteobjects import DeleteObject
		import urllib3
		from .fs_backup import TestBackupDir

		root = os.path.realpath(os.path.join(os.path.dirname(__file__), '../..'))
		if root not in sys.path:
		sys.path.append(root)

		from .fs_backup import TestBackupDir

		# Should fail if either of env vars does not exist
		host = os.environ['PG_PROBACKUP_S3_HOST']
		port = os.environ['PG_PROBACKUP_S3_PORT']
Expand Down