db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-01-07 13:40:17 +02:00
Code Issues Releases Activity

Merge branch 'master'

Browse Source
This commit is contained in:
a.kozhemyakin 2021-02-15 10:46:12 +03:00
commit eb91b7d54a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/helpers/ptrack_helpers.py
View File

@ -1541,6 +1541,13 @@ class ProbackupTest(object):
),
ignore_errors=True
)
<<<<<<< HEAD
=======
try:
shutil.rmtree(os.path.join(self.tmp_path, module_name), ignore_errors=True)
except:
pass
>>>>>>> 7f1d12b457f54ddebc0b6f65a1124e7f75dd50ae
def pgdata_content(self, pgdata, ignore_ptrack=True, exclude_dirs=None):
""" return dict with directory content. "