all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Leo Nunner <l.nunner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 manager 2/2] test: allow access to the cluster-wide 'vzdump.conf'
Date: Tue,  7 Mar 2023 13:11:05 +0100	[thread overview]
Message-ID: <20230307121106.56820-4-l.nunner@proxmox.com> (raw)
In-Reply-To: <20230307121106.56820-1-l.nunner@proxmox.com>

The hardcoded filename check for cluster file access needs to include
'vzdump.conf', since vzdump now always tries to read that file when
parsing configurations.

Signed-off-by: Leo Nunner <l.nunner@proxmox.com>
---
 test/vzdump_new_test.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/vzdump_new_test.pl b/test/vzdump_new_test.pl
index 8cd73075..64f8e0a1 100755
--- a/test/vzdump_new_test.pl
+++ b/test/vzdump_new_test.pl
@@ -58,7 +58,9 @@ $pve_cluster_module->mock(
     get_config => sub {
 	my ($filename) = @_;
 
-	die "unexpected filename '$filename'\n" if $filename ne 'storage.cfg';
+	if(!grep(/^$filename$/, ('storage.cfg', 'vzdump.conf'))) {
+	    die "unexpected filename '$filename'\n";
+	}
 	return $storage_config;
     },
     # never update during the tests
-- 
2.30.2





  parent reply	other threads:[~2023-03-07 12:11 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-07 12:11 [pve-devel] [PATCH v2 cluster manager docs] Introduce cluster-wide vzdump configuration Leo Nunner
2023-03-07 12:11 ` [pve-devel] [PATCH v2 cluster] fix #4234: vzdump: add cluster-wide configuration Leo Nunner
2023-03-11 17:12   ` [pve-devel] applied: " Thomas Lamprecht
2023-03-07 12:11 ` [pve-devel] [PATCH v2 manager 1/2] fix #4235: " Leo Nunner
2023-03-07 12:11 ` Leo Nunner [this message]
2023-03-07 12:11 ` [pve-devel] [PATCH v2 docs] vzdump: document the new cluster-wide config file Leo Nunner

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=20230307121106.56820-4-l.nunner@proxmox.com \
    --to=l.nunner@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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal