From 8c2a3d75bfee8c4e06af24715fd21161a37cc8ac Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Fri, 28 Oct 2022 12:06:01 +0200 Subject: [PATCH 1/2] Added quotes to error message Added quotes to error message to make it read a bit better. Ticket: None Changelog: None Signed-off-by: Lars Erik Wik --- cfbs/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cfbs/main.py b/cfbs/main.py index ee5761a7..c604f7b5 100644 --- a/cfbs/main.py +++ b/cfbs/main.py @@ -47,7 +47,8 @@ def main() -> int: if args.masterfiles and args.command != "init": user_error( - "The option --masterfiles is only for cfbs init, not cfbs %s" % args.command + "The option --masterfiles is only for 'cfbs init', not 'cfbs %s'" + % args.command ) if args.non_interactive and args.command not in ( From f9ecf26b11925f492d4e6146ef74562d2bb7803f Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Fri, 28 Oct 2022 13:04:30 +0200 Subject: [PATCH 2/2] Improved shell tests testing --masterfiles option Ticket: None Changelog: None Signed-off-by: Lars Erik Wik --- tests/shell/028_init_masterfiles_version_3.18.2.sh | 1 + tests/shell/029_init_masterfiles_version_3.18.1-1.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tests/shell/028_init_masterfiles_version_3.18.2.sh b/tests/shell/028_init_masterfiles_version_3.18.2.sh index f5c612dc..cfb804ae 100644 --- a/tests/shell/028_init_masterfiles_version_3.18.2.sh +++ b/tests/shell/028_init_masterfiles_version_3.18.2.sh @@ -9,4 +9,5 @@ rm -rf .git cfbs --non-interactive init --masterfiles=3.18.2 grep '"name": "masterfiles"' cfbs.json grep '"version": "3.18.2"' cfbs.json +grep '"commit": "a87b7fea6f7a88808b327730a4ba784a3dc664eb"' cfbs.json cfbs build diff --git a/tests/shell/029_init_masterfiles_version_3.18.1-1.sh b/tests/shell/029_init_masterfiles_version_3.18.1-1.sh index 1eb4ec18..d040c1dc 100644 --- a/tests/shell/029_init_masterfiles_version_3.18.1-1.sh +++ b/tests/shell/029_init_masterfiles_version_3.18.1-1.sh @@ -9,4 +9,8 @@ rm -rf .git cfbs --non-interactive init --masterfiles=3.18.1-1 grep '"name": "masterfiles"' cfbs.json grep '"version": "3.18.1-1"' cfbs.json +grep '"commit": "b6e9eacc65c797f4c2b4a59056293636c320d0c9"' cfbs.json cfbs build +cfbs --non-interactive update +! grep '"version": "3.18.1-1"' cfbs.json +! grep '"commit": "b6e9eacc65c797f4c2b4a59056293636c320d0c9"' cfbs.json