mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@barebox.org>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@barebox.org>
Subject: [PATCH 3/5] test: py: efiloader: prepare get_dmesg for more general usage
Date: Fri,  9 Jan 2026 17:57:29 +0100	[thread overview]
Message-ID: <20260109170007.805177-4-a.fatoum@barebox.org> (raw)
In-Reply-To: <20260109170007.805177-1-a.fatoum@barebox.org>

Despite the generic sounding name, get_dmesg actually filter for the 'efit'
string, which is not always what's intended. Rename it to get_journalctl
to make the dependency clearer and make it more generic.

Signed-off-by: Ahmad Fatoum <a.fatoum@barebox.org>
---
 test/py/test_linux_efiloader.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/py/test_linux_efiloader.py b/test/py/test_linux_efiloader.py
index 22531bff81f4..8530747a7a6b 100644
--- a/test/py/test_linux_efiloader.py
+++ b/test/py/test_linux_efiloader.py
@@ -4,8 +4,13 @@ import re
 import pytest
 
 
-def get_dmesg(shell):
-    stdout, _, ret = shell.run("journalctl -k --no-pager --grep efi -o cat")
+def get_journalctl(shell, kernel=True, grep=None):
+    opts = ''
+    if grep is not None:
+        opts += f" --grep={grep}"
+    if kernel:
+        opts += " -k"
+    stdout, _, ret = shell.run(f"journalctl --no-pager {opts} -o cat")
     assert ret == 0
     return stdout
 
@@ -19,7 +24,7 @@ def test_efi_kernel_no_warn(shell):
 
 @pytest.mark.lg_feature(['bootable', 'efi'])
 def test_expected_efi_messages(shell, env):
-    dmesg = get_dmesg(shell)
+    dmesg = get_journalctl(shell, 'efi')
 
     expected_patterns = [
         r"efi:\s+EFI v2\.8 by barebox",
-- 
2.47.3




  parent reply	other threads:[~2026-01-09 17:01 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-09 16:57 [PATCH 0/5] test: arm: boot test Debian image in CI Ahmad Fatoum
2026-01-09 16:57 ` [PATCH 1/5] test: arm: multi_v8_efiloader_defconfig: use qcow2 image Ahmad Fatoum
2026-01-09 16:57 ` [PATCH 2/5] test: py: strategy: add helpers for booting kernel and bootm Ahmad Fatoum
2026-01-09 16:57 ` Ahmad Fatoum [this message]
2026-01-09 16:57 ` [PATCH 4/5] test: py: add more kernel boot tests Ahmad Fatoum
2026-01-09 16:57 ` [PATCH 5/5] ci: add Debian ARM64 EFI loader boot test Ahmad Fatoum

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260109170007.805177-4-a.fatoum@barebox.org \
    --to=a.fatoum@barebox.org \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox