From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer 2/6] auto: tests: parse-answer: allow per-test runtime env
Date: Thu, 27 Mar 2025 16:17:13 +0100 [thread overview]
Message-ID: <20250327151718.1084841-3-c.heiss@proxmox.com> (raw)
In-Reply-To: <20250327151718.1084841-1-c.heiss@proxmox.com>
This allows to create custom runtime environment files for tests to use
instead of the common one, to allow testing codepaths which depend on
certain runtime-gathered values.
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
proxmox-auto-installer/tests/parse-answer.rs | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/proxmox-auto-installer/tests/parse-answer.rs b/proxmox-auto-installer/tests/parse-answer.rs
index 39b9401..6d5f228 100644
--- a/proxmox-auto-installer/tests/parse-answer.rs
+++ b/proxmox-auto-installer/tests/parse-answer.rs
@@ -47,7 +47,12 @@ fn setup_test_basic(path: impl AsRef<Path>) -> (SetupInfo, LocaleInfo, RuntimeIn
fn run_named_test(name: &str) {
let resource_path = get_test_resource_path().unwrap();
- let (setup_info, locales, runtime_info, udev_info) = setup_test_basic(&resource_path);
+ let (setup_info, locales, mut runtime_info, udev_info) = setup_test_basic(&resource_path);
+
+ let test_run_env_path = resource_path.join(format!("parse_answer/{name}.run-env.json"));
+ if test_run_env_path.exists() {
+ runtime_info = read_json(test_run_env_path).unwrap()
+ }
let answer_path = resource_path.join(format!("parse_answer/{name}.toml"));
@@ -65,7 +70,12 @@ fn run_named_test(name: &str) {
fn run_named_fail_parse_test(name: &str) {
let resource_path = get_test_resource_path().unwrap();
- let (setup_info, locales, runtime_info, udev_info) = setup_test_basic(&resource_path);
+ let (setup_info, locales, mut runtime_info, udev_info) = setup_test_basic(&resource_path);
+
+ let test_run_env_path = resource_path.join(format!("parse_answer_fail/{name}.run-env.json"));
+ if test_run_env_path.exists() {
+ runtime_info = read_json(test_run_env_path).unwrap()
+ }
let answer_path = resource_path.join(format!("parse_answer_fail/{name}.toml"));
--
2.48.1
_______________________________________________
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:[~2025-03-27 15:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-27 15:17 [pve-devel] [PATCH installer 0/6] fix #5811: add option to retrieve FQDN from DHCP configuration Christoph Heiss
2025-03-27 15:17 ` [pve-devel] [PATCH installer 1/6] auto: utils: avoid a force unwrap() Christoph Heiss
2025-04-04 12:51 ` [pve-devel] applied: " Thomas Lamprecht
2025-03-27 15:17 ` Christoph Heiss [this message]
2025-04-04 12:51 ` [pve-devel] applied: [PATCH installer 2/6] auto: tests: parse-answer: allow per-test runtime env Thomas Lamprecht
2025-03-27 15:17 ` [pve-devel] [PATCH installer 3/6] auto: tests: allow testing for serde parse errors of answer files Christoph Heiss
2025-04-04 12:51 ` [pve-devel] applied: " Thomas Lamprecht
2025-03-27 15:17 ` [pve-devel] [PATCH installer 4/6] tui, common: move network option tests to correct crate Christoph Heiss
2025-04-04 12:54 ` Thomas Lamprecht
2025-03-27 15:17 ` [pve-devel] [PATCH installer 5/6] common: options: allow user-supplied domain for network options Christoph Heiss
2025-03-27 15:17 ` [pve-devel] [PATCH installer 6/6] fix #5811: auto: add option to retrieve FQDN from DHCP configuration Christoph Heiss
2025-04-01 13:15 ` Daniel Kral
2025-04-01 13:25 ` Christoph Heiss
2025-04-01 13:29 ` Stefan Hanreich
2025-04-01 13:44 ` Daniel Kral
2025-04-01 14:58 ` Thomas Lamprecht
2025-04-01 13:45 ` [pve-devel] [PATCH installer 0/6] fix #5811: " Daniel Kral
2025-04-01 14:05 ` Christoph Heiss
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=20250327151718.1084841-3-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal