yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

re-tidy perl code

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2025-07-31 14:16:25 +02:00
parent 7513e21d74
commit 81261f9ca1
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/run_volume_access_tests.pl
View File

@ -43,8 +43,8 @@ acl:1:/vms/111:vmuser@pve:vmuser:
acl:1:/storage/dir:vmuser@pve:vmuser: acl:1:/storage/dir:vmuser@pve:vmuser:
EOF EOF
my @users = qw(root@pam noperm@pve otherstorage@pve dsallocate@pve dsaudit@pve backup@pve vmuser@pve); my @users =
qw(root@pam noperm@pve otherstorage@pve dsallocate@pve dsaudit@pve backup@pve vmuser@pve);
my $pve_cluster_module; my $pve_cluster_module;
$pve_cluster_module = Test::MockModule->new('PVE::Cluster'); $pve_cluster_module = Test::MockModule->new('PVE::Cluster');
@ -91,16 +91,14 @@ my @tests = (
}, },
{ {
volid => 'dir:vztmpl/alpine-3.22-default_20250617_amd64.tar.xz', volid => 'dir:vztmpl/alpine-3.22-default_20250617_amd64.tar.xz',
denied_users => { denied_users => {},
},
allowed_types => { allowed_types => {
'vztmpl' => 1, 'vztmpl' => 1,
}, },
}, },
{ {
volid => 'dir:iso/virtio-win-0.1.271.iso', volid => 'dir:iso/virtio-win-0.1.271.iso',
denied_users => { denied_users => {},
},
allowed_types => { allowed_types => {
'iso' => 1, 'iso' => 1,
}, },
@ -227,9 +225,7 @@ for my $t (@tests) {
my $actual_denied; my $actual_denied;
eval { eval { PVE::Storage::check_volume_access($rpcenv, $user, $cfg, $vmid, $volid, undef); };
PVE::Storage::check_volume_access($rpcenv, $user, $cfg, $vmid, $volid, undef);
};
if (my $err = $@) { if (my $err = $@) {
$actual_denied = 1; $actual_denied = 1;
note($@) if !$expected_denied_users->{$user} # log the error for easy analysis note($@) if !$expected_denied_users->{$user} # log the error for easy analysis
@ -246,9 +242,7 @@ for my $t (@tests) {
my $actual_allowed = 1; my $actual_allowed = 1;
eval { eval { PVE::Storage::check_volume_access($rpcenv, $user, $cfg, $vmid, $volid, $type); };
PVE::Storage::check_volume_access($rpcenv, $user, $cfg, $vmid, $volid, $type);
};
if (my $err = $@) { if (my $err = $@) {
$actual_allowed = undef; $actual_allowed = undef;
note($@) if $expected_allowed_types->{$type} # log the error for easy analysis note($@) if $expected_allowed_types->{$type} # log the error for easy analysis