Merge pull request labgrid-project#1071 from meuren/bareboxdriver_boot_command

driver/bareboxdriver.py: Add parameter 'boot_command'

Author: Bastian-Krause

doc/configuration.rst

@@ -1999,6 +1999,7 @@ Arguments:
     boots (for barebox >=v2025.03.0).
   - bootstring (regex, default="Linux version \\d"): regex that indicating that the Linux Kernel is
     booting
+  - boot_command (str, default="boot -v"): optional, boot command to boot target
   - password (str): optional, password to use for access to the shell
   - login_timeout (int, default=60): timeout for access to the shell
 

labgrid/driver/bareboxdriver.py

@@ -27,6 +27,7 @@ class BareboxDriver(CommandMixin, Driver, CommandProtocol, LinuxBootProtocol):
         interrupt (str): optional, string to interrupt autoboot (use "\x03" for CTRL-C)
         bootstring (regex): optional, regex indicating that the Linux Kernel is booting
         password (str): optional, password to use for access to the shell
+        boot_command (str): optional, boot command to boot target
         login_timeout (int): optional, timeout for access to the shell
     """
     bindings = {"console": ConsoleProtocol, }
@@ -35,6 +36,7 @@ class BareboxDriver(CommandMixin, Driver, CommandProtocol, LinuxBootProtocol):
     interrupt = attr.ib(default="\x04", validator=attr.validators.instance_of(str))
     bootstring = attr.ib(default=r"Linux version \d", validator=attr.validators.instance_of(str))
     password = attr.ib(default="", validator=attr.validators.instance_of(str))
+    boot_command = attr.ib(default="boot -v", validator=attr.validators.instance_of(str))
     login_timeout = attr.ib(default=60, validator=attr.validators.instance_of(int))
 
     def __attrs_post_init__(self):
@@ -213,7 +215,7 @@ def await_boot(self):
         self.console.expect(self.bootstring)
 
     @Driver.check_active
-    def boot(self, name: str):
+    def boot(self, name: str = ""):
         """Boot the default or a specific boot entry
 
         Args:
@@ -224,4 +226,4 @@ def boot(self, name: str):
         if name:
             self.console.sendline(f"boot -v {name}")
         else:
-            self.console.sendline("boot -v")
+            self.console.sendline(self.boot_command)

tests/test_bareboxdriver.py

@@ -41,3 +41,16 @@ def test_barebox_run_error(self, target_with_fakeconsole, mocker):
             res = d.run_check("test")
         res = d.run("test")
         assert res == (['error'], [], 1)
+
+    def test_barebox_boot(self, target_with_fakeconsole, mocker):
+        t = target_with_fakeconsole
+        d = BareboxDriver(t, "barebox", boot_command='boot -v foo')
+        d = t.get_driver(BareboxDriver, activate=False)
+        # mock for d._run('echo $global.loglevel')
+        d._run = mocker.MagicMock(return_value=(['7'], [], 0))
+        t.activate(d)
+        d._run = mocker.MagicMock(return_value=(['success'], [], 0))
+        d.boot()
+        assert d.console.txq.pop() == b"boot -v foo\n"
+        d.boot(name='bar')
+        assert d.console.txq.pop() == b"boot -v bar\n"