[IMP] Fixed tests

Author: Vladimir

odoo_backup_db_cli/cli.py

@@ -190,7 +190,10 @@ def update_config(
     ATTENTION: will overwrite the environment if it exist.
     """
     if not os.path.isfile(path):
-        sys.exit(color_error_msg('The configuration file does not exist.'))
+        logging.info(
+            color_error_msg('The configuration file does not exist.')
+        )
+        sys.exit(CodeError.FILE_DOES_NOT_EXIST)
     config = configparser.ConfigParser()
     config.read(path)
     env = {
@@ -215,7 +218,9 @@ def update_config(
     for key, value in env.items():  # noqa: WPS110
         if value is not None:
             config[environment][key] = str(value)
-    return sys.exit(write_config_file(config, path))
+
+    write_config_file(config, path)
+    return sys.exit(CodeError.SUCCESS)
 
 
 @main.command()  # noqa: C901,WPS213
@@ -236,16 +241,15 @@ def update_config(
 def create_backup(environment, save_type, path):  # noqa: C901,WPS213
     """Creates a backup according to the settings of the selected environment."""
     if not os.path.isfile(path):
-        sys.exit(
-            color_error_msg(
-                'The configuration file {0} does not exist.'.format(path)
-            )
+        logging.info(
+            'The configuration file {0} does not exist.'.format(path)
         )
+        return sys.exit(CodeError.FILE_DOES_NOT_EXIST)
 
     config = configparser.ConfigParser(default_section='common', allow_no_value=True)
     config.read(path)
     if not save_type:
-        save_type = environment
+        save_type = 'local' if environment == 'test' else environment
     try:
         plugin = getattr(
             importlib.import_module(
@@ -262,7 +266,8 @@ def create_backup(environment, save_type, path):  # noqa: C901,WPS213
     try:
         bk_handler.check_config()
     except Exception as exp:
-        sys.exit(color_error_msg(exp))
+        logging.info(color_error_msg(exp))
+        return sys.exit(CodeError.NO_SETTINGS)
 
     if config[environment].get('with_db'):
         dump_db(config, environment)

odoo_backup_db_cli/protocols/ftp.py

@@ -13,18 +13,22 @@
 class FtpBackupHandler(RemoteBackupHandler, FSBackupHandler):
     """FTP Backup Handler."""
 
+    def __init__(self, *args, **kwargs):
+        super(FtpBackupHandler, self).__init__(*args, **kwargs)
+        self.ftp = ftplib.FTP()  # noqa: S321
+
+
     def _get_required_settings(self):
         res = super()._get_required_settings()
         res.append(
             (
                 ('username', 'password', 'host', 'port', 'pasv'),
-                'The creditials for the ftp server is not fully configured.'
+                'The credentials for the ftp server is not fully configured.'
             )
         )
         return res
 
     def _connect(self):
-        self.ftp = ftplib.FTP()  # noqa: S321
         self.ftp.connect(
             self.env.get('host'),
             int(self.env.get('port'))

odoo_backup_db_cli/protocols/sftp.py

@@ -54,8 +54,8 @@ def _get_required_settings(self):
         res = super()._get_required_settings()
         res.append(
             (
-                ('username', 'host', 'port'),
-                'The creditials for the sftp server is not fully configured.'
+                ('username', 'host', 'port', 'pasv'),
+                'The credentials for the ftp server is not fully configured.'
             )
         )
         return res

tests/cli/test_update_config.py

@@ -39,8 +39,6 @@ def test_ok():
         'odoo2',
         '-w',
         '1234',
-        '-t',
-        'sftp',
         '-r',
         '5435',
         '-s',
@@ -58,6 +56,9 @@ def test_ok():
         '-d',
         'test',
         '-F',
+        'True',
+        '-D',
+        'True',
         '-f',
         '/tmp/test',
     )
@@ -79,7 +80,6 @@ def test_ok():
         'db_port': '5434',
         'db_username': 'odoo2',
         'db_password': '1234',
-        'type': 'sftp',
         'port': '5435',
         'pasv': 'True',
         'username': 'kek',
@@ -89,6 +89,7 @@ def test_ok():
         'clean_backup_after': '12',
         'db_name': 'test',
         'with_filestore': 'True',
+        'with_db': 'True',
         'filestore_location': '/tmp/test',
     }
     assert res.exit_code == CodeError.SUCCESS
@@ -113,8 +114,6 @@ def test_check_exist_config():
         'odoo2',
         '-w',
         '1234',
-        '-t',
-        'sftp',
         '-H',
         '0.1.2.3',
         '-r',
@@ -134,6 +133,7 @@ def test_check_exist_config():
         '-d',
         'test',
         '-F',
+        'True',
         '-f',
         '/tmp/test',
     )

tests/protocols/sftp/test_sftp_save_filestore.py

@@ -39,6 +39,7 @@ def test_with_filestore(
         'filestore_location': '/tmp/test',
     }
     sftp_backup_handler_instance = SftpBackupHandler(config, 'test')
+    sftp_backup_handler_instance._connect()
     sftp_backup_handler_instance._save_filestore()
     assert cwd_mock.call_count == 2
     put_mock.assert_called_once()

tests/utils/test_check_config.py

@@ -24,7 +24,7 @@ def get_test_config():
         'db_port': '5434',
         'db_username': 'odoo2',
         'db_password': '1234',
-        'type': 'local',
+        # 'type': 'local',
         'host': '0.1.2.3',
         'port': '5435',
         'pasv': 'True',
@@ -35,6 +35,7 @@ def get_test_config():
         'clean_backup_after': '12',
         'db_name': 'test',
         'with_filestore': 'True',
+        'with_db': 'True',
         'filestore_location': '/tmp/test',
     }
     return config