From e11741ca949e26292daaa5ef053c414f380bc789 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 12 Jan 2021 10:53:12 +0100 Subject: [PATCH] fix default arg parse for password --- src/yunohost/app.py | 4 ++++ src/yunohost/tests/test_apps_arguments_parsing.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 8f75889c5..bf51d0c4a 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -2423,6 +2423,10 @@ class YunoHostArgumentFormatParser(object): if parsed_question.ask is None: parsed_question.ask = "Enter value for '%s':" % parsed_question.name + + # Empty value is parsed as empty string + if parsed_question.default == "": + parsed_question.default = None return parsed_question diff --git a/src/yunohost/tests/test_apps_arguments_parsing.py b/src/yunohost/tests/test_apps_arguments_parsing.py index 88c235252..b501e5c4f 100644 --- a/src/yunohost/tests/test_apps_arguments_parsing.py +++ b/src/yunohost/tests/test_apps_arguments_parsing.py @@ -260,6 +260,10 @@ def test_parse_args_in_yunohost_format_password_no_input_optional(): assert _parse_args_in_yunohost_format(answers, questions) == expected_result + questions = [{"name": "some_password", "type": "password", "optional": True, "default": ""}] + + assert _parse_args_in_yunohost_format(answers, questions) == expected_result + def test_parse_args_in_yunohost_format_password_optional_with_input(): questions = [