From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D47E91FF16B for ; Tue, 29 Jul 2025 13:15:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D37CAE406; Tue, 29 Jul 2025 13:16:05 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 29 Jul 2025 13:15:18 +0200 Message-ID: <20250729111557.136012-6-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250729111557.136012-1-w.bumiller@proxmox.com> References: <20250729111557.136012-1-w.bumiller@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753787749011 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.078 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH storage 05/26] tests: drop rootdir/ tests X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Wolfgang Bumiller --- src/test/parse_volname_test.pm | 10 ---------- src/test/path_to_volume_id_test.pm | 11 +++-------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/test/parse_volname_test.pm b/src/test/parse_volname_test.pm index 9e96842..0d077a9 100644 --- a/src/test/parse_volname_test.pm +++ b/src/test/parse_volname_test.pm @@ -90,11 +90,6 @@ my $tests = [ # # container rootdir # - { - description => 'Container rootdir, sub directory', - volname => "rootdir/$vmid", - expected => ['rootdir', "$vmid", "$vmid"], - }, { description => 'Container rootdir, subvol', volname => "$vmid/subvol-$vmid-disk-0.subvol", @@ -182,11 +177,6 @@ my $tests = [ expected => "unable to parse directory volume name 'vztmpl/debian-10.0-standard_10.0-1_amd64.zip.gz'\n", }, - { - description => 'Failed match: Container rootdir, subvol', - volname => "rootdir/subvol-$vmid-disk-0", - expected => "unable to parse directory volume name 'rootdir/subvol-$vmid-disk-0'\n", - }, { description => 'Failed match: VM disk image, linked, vhdx', volname => "$vmid/base-$vmid-disk-0.vhdx/$vmid/vm-$vmid-disk-0.vhdx", diff --git a/src/test/path_to_volume_id_test.pm b/src/test/path_to_volume_id_test.pm index 9a5ecbb..ab7e276 100644 --- a/src/test/path_to_volume_id_test.pm +++ b/src/test/path_to_volume_id_test.pm @@ -138,10 +138,10 @@ my @tests = ( }, { - description => 'Rootdir', - volname => "$storage_dir/private/1234/", # fileparse needs / at the end + description => 'Rootdir, folder subvol, legacy naming', + volname => "$storage_dir/images/1234/subvol-1234-disk-0.subvol/", # fileparse needs / at the end expected => [ - 'rootdir', 'local:rootdir/1234', + 'ct-vol', 'local:1234/subvol-1234-disk-0.subvol', ], }, { @@ -203,11 +203,6 @@ my @tests = ( volname => "$storage_dir/template/cache/debian-10.0-standard_10.0-1_amd64.zip.gz", expected => [''], }, - { - description => 'Rootdir as subvol, wrong path', - volname => "$storage_dir/private/subvol-19254-disk-0/", - expected => [''], - }, { description => 'Backup, wrong format, openvz, zip.gz', volname => "$storage_dir/dump/vzdump-openvz-16112-2020_03_30-21_39_30.zip.gz", -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel