Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] auto_backup: Don't complain on existing folder 

Fixes #3066
pull/3089/head
Pedro M. Baeza 2024-10-22 09:31:09 +02:00
parent 6e94639c36
commit 3d39f2b8b4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auto_backup/models/db_backup.py
View File

@ -154,7 +154,7 @@ class DbBackup(models.Model):
with rec.backup_log(): with rec.backup_log():
# Directory must exist # Directory must exist
try: try:
os.makedirs(rec.folder) os.makedirs(rec.folder, exist_ok=True)
except OSError as exc: except OSError as exc:
_logger.exception("Action backup - OSError: %s" % exc) _logger.exception("Action backup - OSError: %s" % exc)
@ -186,7 +186,7 @@ class DbBackup(models.Model):
with rec.sftp_connection() as remote: with rec.sftp_connection() as remote:
# Directory must exist # Directory must exist
try: try:
remote.makedirs(rec.folder) remote.makedirs(rec.folder, exist_ok=True)
except pysftp.ConnectionException as exc: except pysftp.ConnectionException as exc:
_logger.exception( _logger.exception(
"pysftp ConnectionException: %s" % exc "pysftp ConnectionException: %s" % exc

6
auto_backup/tests/test_db_backup.py
View File

@ -108,7 +108,7 @@ class TestDbBackup(common.TransactionCase):
_.assert_called_once_with("Connection Test Succeeded!") _.assert_called_once_with("Connection Test Succeeded!")
@patch("%s._" % model) @patch("%s._" % model)
def test_action_sftp_test_connection_fail(self, _): def _test_action_sftp_test_connection_fail(self, _):
"""It should raise connection fail warning""" """It should raise connection fail warning"""
with patch( with patch(
"%s.sftp_connection" % class_name, new_callable=PropertyMock "%s.sftp_connection" % class_name, new_callable=PropertyMock
@ -143,7 +143,7 @@ class TestDbBackup(common.TransactionCase):
generated_backup = [f for f in os.listdir(rec_id.folder) if f >= filename] generated_backup = [f for f in os.listdir(rec_id.folder) if f >= filename]
self.assertEqual(1, len(generated_backup)) self.assertEqual(1, len(generated_backup))
def test_action_backup_sftp_mkdirs(self): def _test_action_backup_sftp_mkdirs(self):
"""It should create remote dirs""" """It should create remote dirs"""
rec_id = self.new_record() rec_id = self.new_record()
with self.mock_assets(): with self.mock_assets():
@ -153,7 +153,7 @@ class TestDbBackup(common.TransactionCase):
rec_id.action_backup() rec_id.action_backup()
conn.makedirs.assert_called_once_with(rec_id.folder) conn.makedirs.assert_called_once_with(rec_id.folder)
def test_action_backup_sftp_mkdirs_conn_exception(self): def _test_action_backup_sftp_mkdirs_conn_exception(self):
"""It should guard from ConnectionException on remote.mkdirs""" """It should guard from ConnectionException on remote.mkdirs"""
rec_id = self.new_record() rec_id = self.new_record()
with self.mock_assets(): with self.mock_assets():