[IMP] Have fixed all the tests

Author: Vladimir

tests/cli/test_create_backup.py

@@ -36,6 +36,7 @@ def test_ok(dump_db_mock, dump_filestore_mock, import_module_mock):
         'backup_location': '/tmp/test',
         'clean_backup_after': '12',
         'db_name': 'test',
+        'with_db': 'True',
         'with_filestore': 'True',
         'filestore_location': '/tmp/test',
     }

tests/protocols/ftp/test_ftp_save_db.py

@@ -3,11 +3,14 @@
 
 # Stdlib:
 import configparser
+from datetime import datetime
 
 # Thirdparty:
 from mock import patch
 from odoo_backup_db_cli.protocols.ftp import FtpBackupHandler, ftplib, os
 
+FORMAT_TIME = '%Y-%m-%d-%H-%M-%S'
+
 
 @patch.object(os, 'remove')
 @patch.object(ftplib.FTP, 'mkd')
@@ -96,7 +99,7 @@ def test_ok_with_subfolder(
         'with_filestore': 'True',
         'filestore_location': '/tmp/test',
     }
-    nlst_mock.return_value = ["test"]
+    nlst_mock.return_value = [datetime.now().strftime(FORMAT_TIME)]
     ftp_backup_handler_instance = FtpBackupHandler(config, 'test')
     ftp_backup_handler_instance._save_db()
     ftp_mk_dirs_mock.assert_called_once()

tests/protocols/sftp/test_sftp_delete_old_backups.py

@@ -8,6 +8,9 @@
 from mock import patch
 from odoo_backup_db_cli.protocols.sftp import SftpBackupHandler, pysftp
 
+
+@patch.object(pysftp.CnOpts, 'get_hostkey')
+@patch('pysftp.paramiko.Transport')
 @patch('odoo_backup_db_cli.protocols.sftp.pysftp.Connection.pwd')
 @patch.object(pysftp.Connection, 'listdir', side_effect=(('2020-01-01-01-01-01',),('1', '2')))
 @patch.object(pysftp.Connection, 'cwd')
@@ -19,7 +22,9 @@ def test_delete(
     cwd_mock,
     listdir_mock,
     pwd_mock,
-    ):
+    hostkey_mock,
+    transport_mock
+):
     config = configparser.ConfigParser()
     config['test'] = {
         'db_host': '0.0.0.0',
@@ -40,13 +45,16 @@ def test_delete(
         'filestore_location': '/tmp/test',
     }
     sftp_backup_handler_instance = SftpBackupHandler(config, 'test')
+    sftp_backup_handler_instance._connect()
     sftp_backup_handler_instance._delete_old_backups()
     assert remove_mock.call_count == 2
     assert listdir_mock.call_count == 2
     assert cwd_mock.call_count == 4
     rmdir_mock.assert_called_once()
 
 
+@patch.object(pysftp.CnOpts, 'get_hostkey')
+@patch('pysftp.paramiko.Transport')
 @patch('odoo_backup_db_cli.protocols.sftp.pysftp.Connection.pwd')
 @patch.object(pysftp.Connection, 'listdir', side_effect=(('2020',),('1', '2')))
 @patch.object(pysftp.Connection, 'cwd')
@@ -58,7 +66,9 @@ def test_try_delete_incorrect(
     cwd_mock,
     listdir_mock,
     pwd_mock,
-    ):
+    hostkey_mock,
+    transport_mock
+):
     config = configparser.ConfigParser()
     config['test'] = {
         'db_host': '0.0.0.0',
@@ -79,13 +89,16 @@ def test_try_delete_incorrect(
         'filestore_location': '/tmp/test',
     }
     sftp_backup_handler_instance = SftpBackupHandler(config, 'test')
+    sftp_backup_handler_instance._connect()
     sftp_backup_handler_instance._delete_old_backups()
     assert remove_mock.call_count == 0
     assert listdir_mock.call_count == 1
     assert cwd_mock.call_count == 0
     rmdir_mock.assert_not_called()
 
 
+@patch.object(pysftp.CnOpts, 'get_hostkey')
+@patch('pysftp.paramiko.Transport')
 @patch('odoo_backup_db_cli.protocols.sftp.pysftp.Connection.pwd')
 @patch.object(pysftp.Connection, 'listdir', side_effect=((),('1', '2')))
 @patch.object(pysftp.Connection, 'cwd')
@@ -97,7 +110,9 @@ def test_not_delete(
     cwd_mock,
     listdir_mock,
     pwd_mock,
-    ):
+    hostkey_mock,
+    transport_mock
+):
     config = configparser.ConfigParser()
     config['test'] = {
         'db_host': '0.0.0.0',
@@ -118,6 +133,7 @@ def test_not_delete(
         'filestore_location': '/tmp/test',
     }
     sftp_backup_handler_instance = SftpBackupHandler(config, 'test')
+    sftp_backup_handler_instance._connect()
     sftp_backup_handler_instance._delete_old_backups()
     remove_mock.assert_not_called()
     listdir_mock.assert_called_once()

tests/protocols/sftp/test_sftp_save_db.py

@@ -3,12 +3,17 @@
 
 # Stdlib:
 import configparser
+from datetime import datetime
 
 # Thirdparty:
 from mock import patch
 from odoo_backup_db_cli.protocols.sftp import SftpBackupHandler, pysftp, os
 
+FORMAT_TIME = '%Y-%m-%d-%H-%M-%S'
 
+
+@patch.object(pysftp.CnOpts, 'get_hostkey')
+@patch('pysftp.paramiko.Transport')
 @patch.object(os, 'remove')
 @patch.object(pysftp.Connection, 'makedirs')
 @patch.object(pysftp.Connection, 'mkdir')
@@ -24,7 +29,9 @@ def test_ok_without_subfolder(
     mkdir_mock,
     makedirs_mock,
     remove_mock,
-    ):
+    hostkey_mock,
+    transport_mock
+):
     config = configparser.ConfigParser()
     config['test'] = {
         'db_host': '0.0.0.0',
@@ -46,6 +53,7 @@ def test_ok_without_subfolder(
     }
     listdir_mock.return_value = [""]
     sftp_backup_handler_instance = SftpBackupHandler(config, 'test')
+    sftp_backup_handler_instance._connect()
     sftp_backup_handler_instance._save_db()
     assert cwd_mock.call_count == 3
     put_mock.assert_called_once()
@@ -55,6 +63,8 @@ def test_ok_without_subfolder(
     remove_mock.assert_called_once()
 
 
+@patch.object(pysftp.CnOpts, 'get_hostkey')
+@patch('pysftp.paramiko.Transport')
 @patch.object(os, 'remove')
 @patch.object(pysftp.Connection, 'makedirs')
 @patch.object(pysftp.Connection, 'mkdir')
@@ -70,7 +80,9 @@ def test_ok_with_subfolder(
     mkdir_mock,
     makedirs_mock,
     remove_mock,
-    ):
+    hostkey_mock,
+    transport_mock
+):
     config = configparser.ConfigParser()
     config['test'] = {
         'db_host': '0.0.0.0',
@@ -90,8 +102,9 @@ def test_ok_with_subfolder(
         'with_filestore': 'True',
         'filestore_location': '/tmp/test',
     }
-    listdir_mock.return_value = ["test"]
+    listdir_mock.return_value = [datetime.now().strftime(FORMAT_TIME)]
     sftp_backup_handler_instance = SftpBackupHandler(config, 'test')
+    sftp_backup_handler_instance._connect()
     sftp_backup_handler_instance._save_db()
     assert cwd_mock.call_count == 3
     put_mock.assert_called_once()

tests/protocols/sftp/test_sftp_save_filestore.py

@@ -9,6 +9,8 @@
 from odoo_backup_db_cli.protocols.sftp import SftpBackupHandler, pysftp, os
 
 
+@patch.object(pysftp.CnOpts, 'get_hostkey')
+@patch('pysftp.paramiko.Transport')
 @patch.object(os, 'remove')
 @patch('odoo_backup_db_cli.protocols.sftp.pysftp.Connection.pwd')
 @patch.object(pysftp.Connection, 'put')
@@ -18,7 +20,9 @@ def test_with_filestore(
     put_mock,
     pwd_mock,
     remove_mock,
-    ):
+    hostkey_mock,
+    transport_mock
+):
     config = configparser.ConfigParser()
     config['test'] = {
         'db_host': '0.0.0.0',
@@ -46,6 +50,8 @@ def test_with_filestore(
     remove_mock.assert_called_once()
 
 
+@patch.object(pysftp.CnOpts, 'get_hostkey')
+@patch('pysftp.paramiko.Transport')
 @patch.object(os, 'remove')
 @patch('odoo_backup_db_cli.protocols.sftp.pysftp.Connection.pwd')
 @patch.object(pysftp.Connection, 'put')
@@ -55,7 +61,9 @@ def test_without_filestore(
     put_mock,
     pwd_mock,
     remove_mock,
-    ):
+    hostkey_mock,
+    transport_mock
+):
     config = configparser.ConfigParser()
     config['test'] = {
         'db_host': '0.0.0.0',
@@ -76,6 +84,7 @@ def test_without_filestore(
         'filestore_location': '/tmp/test',
     }
     sftp_backup_handler_instance = SftpBackupHandler(config, 'test')
+    sftp_backup_handler_instance._connect()
     sftp_backup_handler_instance._save_filestore()
     cwd_mock.assert_not_called()
     put_mock.assert_not_called()