|
 |
b91f91 |
boom/command.py | 5 +++--
|
|
|
b91f91 |
tests/command_tests.py | 16 ++++++++++++++++
|
|
|
b91f91 |
2 files changed, 19 insertions(+), 2 deletions(-)
|
|
|
b91f91 |
|
|
|
b91f91 |
diff --git a/boom/command.py b/boom/command.py
|
|
|
b91f91 |
index c9c2f6b..feb5b65 100644
|
|
|
b91f91 |
--- a/boom/command.py
|
|
|
b91f91 |
+++ b/boom/command.py
|
|
|
b91f91 |
@@ -1883,7 +1883,8 @@ def _optional_key_to_arg(optional_key):
|
|
|
b91f91 |
_key_map = {
|
|
|
b91f91 |
BOOM_ENTRY_GRUB_USERS: "--grub-users",
|
|
|
b91f91 |
BOOM_ENTRY_GRUB_ARG: "--grub-arg",
|
|
|
b91f91 |
- BOOM_ENTRY_GRUB_CLASS: "--grub-class"
|
|
|
b91f91 |
+ BOOM_ENTRY_GRUB_CLASS: "--grub-class",
|
|
|
b91f91 |
+ BOOM_ENTRY_GRUB_ID: "--grub-id"
|
|
|
b91f91 |
}
|
|
|
b91f91 |
return _key_map[optional_key] if optional_key in _key_map else None
|
|
|
b91f91 |
|
|
|
b91f91 |
@@ -1914,7 +1915,7 @@ def _set_optional_key_defaults(profile, cmd_args):
|
|
|
b91f91 |
if bls_key not in profile.optional_keys:
|
|
|
b91f91 |
if getattr(cmd_args, bls_key) is not None:
|
|
|
b91f91 |
print("Profile with os_id='%s' does not support %s" %
|
|
|
b91f91 |
- (profile.disp_os_id, _optional_key_to_arg(bls_key)))
|
|
|
b91f91 |
+ (profile.disp_os_id, _optional_key_to_arg(opt_key)))
|
|
|
b91f91 |
return 1
|
|
|
b91f91 |
else:
|
|
|
b91f91 |
if getattr(cmd_args, bls_key) is None:
|
|
|
b91f91 |
diff --git a/tests/command_tests.py b/tests/command_tests.py
|
|
|
b91f91 |
index 00cda3b..d7a766a 100644
|
|
|
b91f91 |
--- a/tests/command_tests.py
|
|
|
b91f91 |
+++ b/tests/command_tests.py
|
|
|
b91f91 |
@@ -244,6 +244,22 @@ class CommandHelperTests(unittest.TestCase):
|
|
|
b91f91 |
(add_opts, del_opts) = _merge_add_del_opts(bp, to_add, to_del)
|
|
|
b91f91 |
self.assertEqual(["log_buf_len=16M", "debug"], add_opts)
|
|
|
b91f91 |
|
|
|
b91f91 |
+ def test__optional_key_to_arg_valid(self):
|
|
|
b91f91 |
+ _optional_key_to_arg = boom.command._optional_key_to_arg
|
|
|
b91f91 |
+ valid_keys_and_args = {
|
|
|
b91f91 |
+ "BOOM_ENTRY_GRUB_USERS": "--grub-users",
|
|
|
b91f91 |
+ "BOOM_ENTRY_GRUB_ARG": "--grub-arg",
|
|
|
b91f91 |
+ "BOOM_ENTRY_GRUB_CLASS": "--grub-class",
|
|
|
b91f91 |
+ "BOOM_ENTRY_GRUB_ID": "--grub-id"
|
|
|
b91f91 |
+ }
|
|
|
b91f91 |
+ for opt_key in valid_keys_and_args.keys():
|
|
|
b91f91 |
+ self.assertEqual(_optional_key_to_arg(opt_key),
|
|
|
b91f91 |
+ valid_keys_and_args[opt_key])
|
|
|
b91f91 |
+
|
|
|
b91f91 |
+ def test__optional_key_to_arg_invalid(self):
|
|
|
b91f91 |
+ _optional_key_to_arg = boom.command._optional_key_to_arg
|
|
|
b91f91 |
+ self.assertEqual(_optional_key_to_arg("INVALID_KEY"), None)
|
|
|
b91f91 |
+
|
|
|
b91f91 |
|
|
|
b91f91 |
# Default test OsProfile identifiers
|
|
|
b91f91 |
test_os_id = "9cb53ddda889d6285fd9ab985a4c47025884999f"
|