diff options
Diffstat (limited to 'lava_scheduler_app/tests')
| -rw-r--r-- | lava_scheduler_app/tests/device-types/bcm2837-rpi-3-b-32.jinja2 | 4 | ||||
| -rw-r--r-- | lava_scheduler_app/tests/test_templates.py | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/lava_scheduler_app/tests/device-types/bcm2837-rpi-3-b-32.jinja2 b/lava_scheduler_app/tests/device-types/bcm2837-rpi-3-b-32.jinja2 index abf445739..1e25b4197 100644 --- a/lava_scheduler_app/tests/device-types/bcm2837-rpi-3-b-32.jinja2 +++ b/lava_scheduler_app/tests/device-types/bcm2837-rpi-3-b-32.jinja2 @@ -21,4 +21,8 @@ {% set extra_kernel_args = "earlycon=uart8250,mmio32,0x3f215040" %} {% endif %} +{% if custom_kernel_args %} +{% set extra_kernel_args = custom_kernel_args %} +{% endif %} + {% set boot_character_delay = 10 %} diff --git a/lava_scheduler_app/tests/test_templates.py b/lava_scheduler_app/tests/test_templates.py index ebe030678..c5828d93e 100644 --- a/lava_scheduler_app/tests/test_templates.py +++ b/lava_scheduler_app/tests/test_templates.py @@ -794,7 +794,23 @@ class TestTemplates(unittest.TestCase): self.assertIn("earlycon=", line) self.assertIn("extra_arg=extra_val", line) checked = True + self.assertTrue(checked) + # test overwriting kernel args + checked = False + context = {'custom_kernel_args': 'custom_arg=custom_val'} + test_template = prepare_jinja_template('staging-rpi3-01', data) + rendered = test_template.render(**context) + template_dict = yaml.load(rendered) + self.assertEqual('bcm2837-rpi-3-b-32', (template_dict['device_type'])) + commands = template_dict['actions']['boot']['methods']['u-boot']['ramdisk']['commands'] + self.assertIsNotNone(commands) + self.assertIsInstance(commands, list) + for line in commands: + if 'setenv bootargs' in line: + self.assertNotIn("earlycon=", line) + self.assertIn("custom_arg=custom_val", line) + checked = True self.assertTrue(checked) def test_panda_template(self): |