From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage] Diskmanage: replace check for zpool binary with a function and mock it
Date: Wed, 10 Feb 2021 11:18:42 +0100 [thread overview]
Message-ID: <20210210101842.16482-1-f.ebner@proxmox.com> (raw)
so the test still works when it's not installed.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/Diskmanage.pm | 8 +++++++-
test/disklist_test.pm | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index e356fb3..64bb813 100644
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -19,6 +19,12 @@ my $PVS = "/sbin/pvs";
my $LVS = "/sbin/lvs";
my $LSBLK = "/bin/lsblk";
+sub check_bin {
+ my ($path) = @_;
+
+ return -x $path;
+}
+
sub verify_blockdev_path {
my ($rel_path) = @_;
@@ -201,7 +207,7 @@ sub get_zfs_devices {
my ($lsblk_info) = @_;
my $res = {};
- return {} if ! -x $ZPOOL;
+ return {} if !check_bin($ZPOOL);
# use zpool and parttype uuid,
# because log and cache do not have
diff --git a/test/disklist_test.pm b/test/disklist_test.pm
index bfce1ea..7f0e0be 100644
--- a/test/disklist_test.pm
+++ b/test/disklist_test.pm
@@ -244,6 +244,8 @@ $diskmanage_module->mock('dir_is_empty' => sub {
return 1;
});
print("\tMocked dir_is_empty\n");
+$diskmanage_module->mock('check_bin' => sub { return 1; });
+print("\tMocked check_bin\n");
my $tools_module= new Test::MockModule('PVE::ProcFSTools', no_auto => 1);
$tools_module->mock('parse_proc_mounts' => \&mocked_parse_proc_mounts);
print("\tMocked parse_proc_mounts\n");
--
2.20.1
next reply other threads:[~2021-02-10 10:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-10 10:18 Fabian Ebner [this message]
2021-02-19 14:32 ` [pve-devel] applied: " 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=20210210101842.16482-1-f.ebner@proxmox.com \
--to=f.ebner@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