From cf91a745f5920255c9f4acb4a930b0900d189e65 Mon Sep 17 00:00:00 2001 From: vshepard <v.shepard@postgrespro.ru> Date: Tue, 30 Jan 2024 07:42:19 +0100 Subject: [PATCH] Move file control for tests --- testgres/plugins/__init__.py | 3 +-- testgres/plugins/pg_probackup2/pg_probackup2/app.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/testgres/plugins/__init__.py b/testgres/plugins/__init__.py index e60331f0..8c19a23b 100644 --- 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 index 6b176488..a8050f94 100644 --- 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,9 +36,10 @@ def __str__(self): return '\n ERROR: {0}\n CMD: {1}'.format(repr(self.message), self.cmd) -# Local or S3 backup +# Local backup control fs_backup_class = FSTestBackupDir + class ProbackupApp: def __init__(self, test_class: unittest.TestCase,