From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer v3 3/3] test: add test for kernel commandline parsing
Date: Mon, 11 Nov 2024 12:05:17 +0100 [thread overview]
Message-ID: <20241111110523.261482-4-c.heiss@proxmox.com> (raw)
In-Reply-To: <20241111110523.261482-1-c.heiss@proxmox.com>
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
Changes v2 -> v3:
* fixed typo in test message
* added explicit test for nomodeset preservation
Changes v1 -> v2:
* new patch
Proxmox/Install/Config.pm | 2 +-
test/Makefile | 7 +++-
test/parse-kernel-cmdline.pl | 62 ++++++++++++++++++++++++++++++++++++
3 files changed, 69 insertions(+), 2 deletions(-)
create mode 100755 test/parse-kernel-cmdline.pl
diff --git a/Proxmox/Install/Config.pm b/Proxmox/Install/Config.pm
index 6260ade..6d47b75 100644
--- a/Proxmox/Install/Config.pm
+++ b/Proxmox/Install/Config.pm
@@ -11,7 +11,7 @@ use Proxmox::Log;
use Proxmox::Install::ISOEnv;
use Proxmox::Sys::Net;
-my sub parse_kernel_cmdline {
+sub parse_kernel_cmdline {
my ($cfg) = @_;
my $cmdline = Proxmox::Install::RunEnv::get('kernel_cmdline');
diff --git a/test/Makefile b/test/Makefile
index c473af8..70a05be 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,7 +3,8 @@ all:
export PERLLIB=..
.PHONY: check
-check: test-zfs-arc-max test-run-command test-parse-fqdn test-ui2-stdio test-zfs-get-pool-list
+check: test-zfs-arc-max test-run-command test-parse-fqdn test-ui2-stdio \
+ test-zfs-get-pool-list test-parse-kernel-cmdline
.PHONY: test-zfs-arc-max
test-zfs-arc-max:
@@ -24,3 +25,7 @@ test-ui2-stdio:
.PHONY: test-zfs-get-pool-list
test-zfs-get-pool-list:
./zfs-get-pool-list.pl
+
+.PHONY: test-parse-kernel-cmdline
+test-parse-kernel-cmdline:
+ ./parse-kernel-cmdline.pl
diff --git a/test/parse-kernel-cmdline.pl b/test/parse-kernel-cmdline.pl
new file mode 100755
index 0000000..0c6ce82
--- /dev/null
+++ b/test/parse-kernel-cmdline.pl
@@ -0,0 +1,62 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use Test::MockModule qw(strict);
+
+use Proxmox::Install::RunEnv;
+use Proxmox::Install::Config qw(parse_kernel_cmdline);
+
+my $proxmox_install_runenv = Test::MockModule->new('Proxmox::Install::RunEnv');
+my $proxmox_install_isoenv = Test::MockModule->new('Proxmox::Install::ISOEnv');
+
+$proxmox_install_isoenv->redefine(
+ get => sub {
+ my ($k) = @_;
+ return { product => 'pve' } if !defined($k);
+ die "iso environment key $k not mocked!\n";
+ },
+);
+
+my sub mock_kernel_cmdline {
+ my ($cmdline) = @_;
+
+ $proxmox_install_runenv->redefine(
+ get => sub {
+ my ($k) = @_;
+ return $cmdline if $k eq 'kernel_cmdline';
+ die "iso environment key $k not mocked!\n";
+ },
+ );
+}
+
+sub is_parsed {
+ my ($cmdline, $expected) = @_;
+
+ mock_kernel_cmdline($cmdline);
+ my $cfg = Proxmox::Install::Config::parse_kernel_cmdline({});
+
+ is($cfg->{target_cmdline}, $expected, "filtered kernel commandline matched expected: ${expected}");
+}
+
+is_parsed(
+ 'BOOT_IMAGE=/vmlinuz-6.8.12-1-pve root=/dev/mapper/pve-root ro quiet',
+ ''
+);
+
+is_parsed(
+ 'BOOT_IMAGE=/vmlinuz-6.8.12-1-pve root=/dev/mapper/pve-root ro= quiet',
+ 'ro='
+);
+
+is_parsed(
+ 'a BOOT_IMAGE=/vmlinuz-6.8.12-1-pve b root=/dev/mapper/pve-root c ro d quiet e',
+ 'a b c d e'
+);
+
+is_parsed('proxmox-foo foo=bar proxtui', 'foo=bar');
+is_parsed('proxmox-foo nomodeset quiet', 'nomodeset');
+
+done_testing();
--
2.47.0
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-11-11 11:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-11 11:05 [pve-devel] [PATCH installer v3 0/3] properly filter out all installer-related kernel arguments Christoph Heiss
2024-11-11 11:05 ` [pve-devel] [PATCH installer v3 1/3] low level: config: filter out kernel cmdline on word boundaries Christoph Heiss
2024-11-11 11:05 ` [pve-devel] [PATCH installer v3 2/3] low level: config: filter out all installer-related kernel arguments Christoph Heiss
2024-11-11 11:05 ` Christoph Heiss [this message]
2024-11-11 12:30 ` [pve-devel] applied: [PATCH installer v3 0/3] properly " Thomas Lamprecht
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=20241111110523.261482-4-c.heiss@proxmox.com \
--to=c.heiss@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.