public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Max R. Carrara" <m.carrara@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Wolfgang Bumiller <w.bumiller@proxmox.com>
Subject: [PATCH pve-storage v3 35/51] test: parse volname: modernize code
Date: Tue, 17 Nov 2026 21:39:07 +0100	[thread overview]
Message-ID: <20261117203953.913035-36-m.carrara@proxmox.com> (raw)
In-Reply-To: <20261117203953.913035-1-m.carrara@proxmox.com>

Modernize the existing code in `parse_volname_test.pm` while leaving
the tests unchanged otherwise.

In particular,
- move the test execution code into its own subroutine
- add and call a `main()` subroutine
- declare `use v5.36;` instead of `use strict;` and `use warnings;`
- fix a handful of typos
- adapt the code style to fit our more modern style guide

Signed-off-by: Max R. Carrara <m.carrara@proxmox.com>
---
 src/test/parse_volname_test.pm | 93 ++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 43 deletions(-)

diff --git a/src/test/parse_volname_test.pm b/src/test/parse_volname_test.pm
index a3b4d568..6beb2be3 100644
--- a/src/test/parse_volname_test.pm
+++ b/src/test/parse_volname_test.pm
@@ -1,9 +1,8 @@
 package PVE::Storage::TestParseVolname;
 
-use strict;
-use warnings;
+use v5.36;
 
 use lib qw(..);
 
 use PVE::Storage;
 use PVE::Storage::Common qw(
@@ -182,28 +181,28 @@ my $tests = [
         description => "Import, ovf",
         volname => 'import/import.ovf',
         expected => ['import', 'import.ovf', undef, undef, undef, undef, 'ovf'],
     },
     {
-        description => "Import, innner file of ova",
+        description => "Import, inner file of ova",
         volname => 'import/import.ova/disk.qcow2',
         expected =>
             ['import', 'import.ova/disk.qcow2', undef, undef, undef, undef, 'ova+qcow2'],
     },
     {
-        description => "Import, innner file of ova",
+        description => "Import, inner file of ova",
         volname => 'import/import.ova/disk.vmdk',
         expected => ['import', 'import.ova/disk.vmdk', undef, undef, undef, undef, 'ova+vmdk'],
     },
     {
-        description => "Import, innner file of ova with whitespace in name",
+        description => "Import, inner file of ova with whitespace in name",
         volname => 'import/import.ova/OS disk.vmdk',
         expected =>
             ['import', 'import.ova/OS disk.vmdk', undef, undef, undef, undef, 'ova+vmdk'],
     },
     {
-        description => "Import, innner file of ova",
+        description => "Import, inner file of ova",
         volname => 'import/import.ova/disk.raw',
         expected => ['import', 'import.ova/disk.raw', undef, undef, undef, undef, 'ova+raw'],
     },
     #
     # failed matches
@@ -249,11 +248,11 @@ my $tests = [
     },
 ];
 
 # create more test cases for VM disk images matches
 my $disk_suffix = ['raw', 'qcow2', 'vmdk'];
-foreach my $s (@$disk_suffix) {
+for my $s ($disk_suffix->@*) {
     my @arr = (
         {
             description => "VM disk image, $s",
             volname => "$vmid/vm-$vmid-disk-1.$s",
             expected => [
@@ -280,23 +279,23 @@ foreach my $s (@$disk_suffix) {
                 'vm-vol', "base-$vmid-disk-0.$s", "$vmid", undef, undef, 'base-', "$s",
             ],
         },
     );
 
-    push @$tests, @arr;
+    push($tests->@*, @arr);
 }
 
 # create more test cases for backup files matches
 my $bkp_suffix = {
     qemu => ['vma', 'vma.gz', 'vma.lzo', 'vma.zst'],
     lxc => ['tar', 'tgz', 'tar.gz', 'tar.lzo', 'tar.zst', 'tar.bz2'],
     openvz => ['tar', 'tgz', 'tar.gz', 'tar.lzo', 'tar.zst'],
 };
 
-foreach my $virt (keys %$bkp_suffix) {
+for my $virt (keys $bkp_suffix->%*) {
     my $suffix = $bkp_suffix->{$virt};
-    foreach my $s (@$suffix) {
+    for my $s ($suffix->@*) {
         my @arr = (
             {
                 description => "Backup archive, $virt, $s",
                 volname => "backup/vzdump-$virt-$vmid-2020_03_30-21_12_40.$s",
                 expected => [
@@ -309,32 +308,32 @@ foreach my $virt (keys %$bkp_suffix) {
                     'raw',
                 ],
             },
         );
 
-        push @$tests, @arr;
+        push($tests->@*, @arr);
     }
 }
 
 # create more test cases for failed backup files matches
 my $non_bkp_suffix = {
     qemu => ['vms.gz', 'vma.xz'],
     lxc => ['zip.gz', 'tgz.lzo'],
 };
-foreach my $virt (keys %$non_bkp_suffix) {
+for my $virt (keys $non_bkp_suffix->%*) {
     my $suffix = $non_bkp_suffix->{$virt};
-    foreach my $s (@$suffix) {
+    for my $s ($suffix->@*) {
         my @arr = (
             {
                 description => "Failed match: Backup archive, $virt, $s",
                 volname => "backup/vzdump-$virt-$vmid-2020_03_30-21_12_40.$s",
                 expected =>
                     "unable to parse directory volume name 'backup/vzdump-$virt-$vmid-2020_03_30-21_12_40.$s'\n",
             },
         );
 
-        push @$tests, @arr;
+        push($tests->@*, @arr);
     }
 }
 
 my sub map_is_base {
     my ($plugin_name, $is_base) = @_;
@@ -590,45 +589,53 @@ push $tests->@*,
             plugin => 'PVE::Storage::PBSPlugin',
             expected => "unable to parse PBS volume name 'images/host/999/2025-08-06T14:27:07Z'\n",
         },
     );
 
-#
-# run through test case array
-#
-plan tests => scalar @$tests + 1;
+my sub run_tests($tests) {
+    my $seen_vtype = {};
+    my $vtype_subdirs = { map { $_ => 1 } keys plugin_get_default_vtype_subdirs()->%* };
 
-my $seen_vtype;
-my $vtype_subdirs =
-    { map { $_ => 1 } keys %{ plugin_get_default_vtype_subdirs() } };
+    for my $t ($tests->@*) {
+        my $description = $t->{description};
+        my $volname = $t->{volname};
+        my $expected = $t->{expected};
 
-foreach my $t (@$tests) {
-    my $description = $t->{description};
-    my $volname = $t->{volname};
-    my $expected = $t->{expected};
+        my $got;
+        if (my $plugin = $t->{plugin}) {
+            eval { $got = [$plugin->parse_volname($volname)] };
+        } else {
+            eval { $got = [PVE::Storage::Plugin->parse_volname($volname)] };
+        }
+        $got = $@ if $@;
 
-    my $got;
-    if (my $plugin = $t->{plugin}) {
-        eval { $got = [$plugin->parse_volname($volname)] };
-    } else {
-        eval { $got = [PVE::Storage::Plugin->parse_volname($volname)] };
+        is_deeply($got, $expected, $description);
+
+        $seen_vtype->{ $expected->[0] } = 1 if ref $expected eq 'ARRAY';
     }
-    $got = $@ if $@;
 
-    is_deeply($got, $expected, $description);
+    # every directory type needs a test: the volumes of VMs and containers all use the directory of the
+    # 'images' type, and the in-tree plugins return 'rootdir' for no volume
+    my $seen_subdir_vtype = {};
+    for my $vtype (keys $seen_vtype->%*) {
+        $vtype = 'images' if PVE::Storage::Common::is_guest_vtype($vtype);
+        $seen_subdir_vtype->{$vtype} = 1;
+    }
+    delete $vtype_subdirs->{rootdir};
+    is_deeply($seen_subdir_vtype, $vtype_subdirs, "vtype_subdir check");
 
-    $seen_vtype->{ @$expected[0] } = 1 if ref $expected eq 'ARRAY';
+    return;
 }
 
-# every directory type needs a test: the volumes of VMs and containers all use the directory of the
-# 'images' type, and the in-tree plugins return 'rootdir' for no volume
-my $seen_subdir_vtype = {};
-for my $vtype (keys $seen_vtype->%*) {
-    $vtype = 'images' if PVE::Storage::Common::is_guest_vtype($vtype);
-    $seen_subdir_vtype->{$vtype} = 1;
-}
-delete $vtype_subdirs->{rootdir};
-is_deeply($seen_subdir_vtype, $vtype_subdirs, "vtype_subdir check");
+my sub main() {
+    plan tests => scalar($tests->@*) + 1;
 
-done_testing();
+    run_tests($tests);
+
+    done_testing();
+
+    return;
+}
+
+main();
 
 1;
-- 
2.47.3





  parent reply	other threads:[~2026-11-17 20:45 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 20:38 [PATCH manager/storage v3 00/51] Fix #2884: Implement Subdirectory Scanning for Dir-Based Storage Types Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 01/51] test: plugin tests: run tests with at most 4 jobs Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 02/51] plugin, common: remove superfluous use of =pod command paragraph Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 03/51] common: use Exporter module for PVE::Storage::Common Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 04/51] plugin: make get_subdir_files a proper subroutine and update style Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 05/51] plugin api: replace subdir helper methods with standalone functions Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 06/51] common: prevent autovivification in plugin_get_vtype_subdir helper Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 07/51] plugin: break up if-elsif chain into separate if-blocks Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 08/51] plugin: adapt get_subdir_files helper of list_volumes API method Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 09/51] plugin: update code style of list_volumes plugin " Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 10/51] plugin: use closure for obtaining raw volume data in list_volumes Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 11/51] plugin: use closure for inner loop logic " Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 12/51] storage: update code style in function path_to_volume_id Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 13/51] storage: break up if-elsif chain in path_to_volume_id Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 14/51] storage: heave vtype file path parsing logic inside loop into helper Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 15/51] storage: clean up code that was moved into helper in path_to_volume_id Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 16/51] api: status: move content type assert for up-/downloads into helper Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 17/51] api: status: use get_subdir helper method to get content directory Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 18/51] api: status: move up-/download file path parsing code into helper Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 19/51] api: status: simplify file content assertion logic for up-/download Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 20/51] test: guest import: add tests for PVE::GuestImport Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 21/51] tree-wide: introduce parsing module and replace usages of ISO_EXT_RE_0 Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 22/51] common: test: set up parser testing code, add tests for 'iso' vtype Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 23/51] tree-wide: replace usages of VZTMPL_EXT_RE_1 with parsing functions Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 24/51] tree-wide: replace usages of BACKUP_EXT_RE_2 " Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 25/51] tree-wide: replace usages of inline regexes for snippets with parsers Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 26/51] tree-wide: partially replace usages of regexes for 'import' vtype Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 27/51] tree-wide: replace remaining " Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 28/51] tree-wide: simplify recently refactored parsing logic Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 29/51] test: list volumes: reorganize and modernize test running code Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 30/51] test: list volumes: fix broken test checking for vmlist modifications Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 31/51] test: list volumes: introduce new format for test cases Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 32/51] test: list volumes: remove legacy code and migrate cases to new format Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 33/51] plugin: do not return volumes of undeclared content types anymore Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 34/51] plugin: correct comment in get_subdir_files helper Max R. Carrara
2026-11-17 20:39 ` Max R. Carrara [this message]
2026-11-17 20:39 ` [PATCH pve-storage v3 36/51] test: parse volname: adapt tests regarding 'import' volume type Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 37/51] test: parse volname: move VM disk test creation into separate block Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 38/51] test: parse volname: move backup file test creation into sep. block Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 39/51] test: parse volname: parameterize test case creation for some vtypes Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 40/51] test: volume id: modernize code Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 41/51] test: volume id: rename 'volname' test case parameter to 'file' Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 42/51] test: filesystem path: modernize code Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 43/51] plugin: list content directories without globbing Max R. Carrara
2026-11-18  9:12 ` [PATCH pve-storage v3 44/51] fix #2884: implement nested subdir scanning and support 'iso' vtype Max R. Carrara
2026-11-18  9:14 ` [PATCH pve-storage v3 45/51] fix #2884: support nested subdir scanning for 'vztmpl' volume type Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-storage v3 46/51] fix #2884: support nested subdir scanning for 'snippets' vtype Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-storage v3 47/51] test: add more tests for 'import' vtype & guard against nested subdirs Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-storage v3 48/51] test: add tests guarding against subdir scanning for vtypes Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-storage v3 49/51] storage: resolve images in content dir overrides ending with a slash Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-storage v3 50/51] bump the storage plugin API version Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-manager v3 51/51] fix #2884: ui: storage: add field for 'max-scan-depth' property Max R. Carrara

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=20261117203953.913035-36-m.carrara@proxmox.com \
    --to=m.carrara@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    --cc=w.bumiller@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