Skip to content

Commit 992f0c8

Browse files
author
vshepard
committed
Move file control for tests
1 parent 0edc937 commit 992f0c8

File tree

2 files changed

+3
-145
lines changed

2 files changed

+3
-145
lines changed

testgres/plugins/pg_probackup2/pg_probackup2/app.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ def __str__(self):
3737
return '\n ERROR: {0}\n CMD: {1}'.format(repr(self.message), self.cmd)
3838

3939

40+
# Local or S3 backup
41+
fs_backup_class = FSTestBackupDir
42+
4043
class ProbackupApp:
4144

4245
def __init__(self, test_class: unittest.TestCase,
@@ -747,16 +750,5 @@ def load_backup_class(fs_type):
747750

748751
return getattr(module, class_name)
749752

750-
751-
# Local or S3 backup
752-
fs_backup_class = FSTestBackupDir
753-
if os.environ.get('PG_PROBACKUP_S3_TEST', os.environ.get('PROBACKUP_S3_TYPE_FULL_TEST')):
754-
root = os.path.realpath(os.path.join(os.path.dirname(__file__), '../..'))
755-
if root not in sys.path:
756-
sys.path.append(root)
757-
from pg_probackup2.storage.s3_backup import S3TestBackupDir
758-
759-
fs_backup_class = S3TestBackupDir
760-
761753
def build_backup_dir(self, backup='backup'):
762754
return fs_backup_class(rel_path=self.rel_path, backup=backup)

testgres/plugins/pg_probackup2/pg_probackup2/storage/s3_backup.py

Lines changed: 0 additions & 134 deletions
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy