Proxmox/pve-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-common.git synced 2024-12-22 21:33:47 +03:00
Code Releases Activity

test: lock file: get rid of END block that made test always pass

Browse Source 
The exit code of the test would be the exit code of the 'rm' system
call, no matter if the test itself failed or not. Use an eval block
instead of the END block and propagate the error correctly.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-11-14 16:07:32 +01:00 committed by Thomas Lamprecht
parent 5264089d68
commit de6ffbdebf
1 changed files with 47 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
test/lock_file.pl
View File

@ -11,10 +11,6 @@ use PVE::Tools 'lock_file_full';
my $name = "test.lockfile.$$-";
END {
system("rm $name*");
};
# Utilities:
sub forked($$) {
@ -78,43 +74,6 @@ sub assert_not {
die "code shouldn't have run: $what\n" if $_ran{$what};
}
# Regular lock:
new();
lock_file_full($name, 10, 0, sub { ran('single lock') });
assert('single lock');
# Lock multiple times in a row:
new();
lock_file_full($name, 10, 0, sub { ran('lock A') });
assert('lock A');
lock_file_full($name, 10, 0, sub { ran('lock B') });
assert('lock B');
# Nested lock:
new();
lock_file_full($name, 10, 0, sub {
ran('lock A');
lock_file_full($name, 10, 0, sub { ran('lock B') });
assert('lock B');
ran('lock C');
});
assert('lock A');
assert('lock B');
assert('lock C');
# Independent locks:
new();
lock_file_full($name, 10, 0, sub {
ran('lock A');
# locks file "${name}2"
lock_file_full($name.2, 10, 0, sub { ran('lock B') });
assert('lock B');
ran('lock C');
});
assert('lock A');
assert('lock B');
assert('lock C');
# Does it actually lock? (shared=0)
# Can we get two simultaneous shared locks? (shared=1)
sub forktest1($) {
@ -157,5 +116,50 @@ sub forktest1($) {
};
close($fmain);
}
forktest1(0);
forktest1(1);
eval {
# Regular lock:
new();
lock_file_full($name, 10, 0, sub { ran('single lock') });
assert('single lock');
# Lock multiple times in a row:
new();
lock_file_full($name, 10, 0, sub { ran('lock A') });
assert('lock A');
lock_file_full($name, 10, 0, sub { ran('lock B') });
assert('lock B');
# Nested lock:
new();
lock_file_full($name, 10, 0, sub {
ran('lock A');
lock_file_full($name, 10, 0, sub { ran('lock B') });
assert('lock B');
ran('lock C');
});
assert('lock A');
assert('lock B');
assert('lock C');
# Independent locks:
new();
lock_file_full($name, 10, 0, sub {
ran('lock A');
# locks file "${name}2"
lock_file_full($name.2, 10, 0, sub { ran('lock B') });
assert('lock B');
ran('lock C');
});
assert('lock A');
assert('lock B');
assert('lock C');
# Does it actually lock? (shared=0)
# Can we get two simultaneous shared locks? (shared=1)
forktest1(0);
forktest1(1);
};
my $err = $@;
system("rm $name*");
die $err if $err;