nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix test case 180-fd-leaks when running on Fedora (#3911)

This commit is contained in:
Joseph 2020-02-22 09:09:11 +00:00 committed by GitHub
parent a376d1e52f
commit 967ec2e0ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
testcases/t/180-fd-leaks.t
View File

@ -29,6 +29,10 @@ my $tmp = tmpnam();
mkfifo($tmp, 0600) or die "Could not create FIFO in $tmp"; mkfifo($tmp, 0600) or die "Could not create FIFO in $tmp";
my ($outfh, $outname) = tempfile('/tmp/i3-ls-output.XXXXXX', UNLINK => 1); my ($outfh, $outname) = tempfile('/tmp/i3-ls-output.XXXXXX', UNLINK => 1);
# Get fds from a clean shell
my $shoutput = `sh -c "ls -l /proc/self/fd"`;
# Get fds from i3
cmd qq|exec ls -l /proc/self/fd >$outname && echo done >$tmp|; cmd qq|exec ls -l /proc/self/fd >$outname && echo done >$tmp|;
open(my $fh, '<', $tmp); open(my $fh, '<', $tmp);
@ -38,29 +42,39 @@ close($fh);
unlink($tmp); unlink($tmp);
# Get the ls /proc/self/fd output # Get the ls /proc/self/fd output
my $output; my $i3output;
{ {
local $/; local $/;
$output = <$outfh>; $i3output = <$outfh>;
} }
close($outfh); close($outfh);
# Split lines, keep only those which are symlinks. sub extract_fds {
my @lines = grep { /->/ } split("\n", $output); my $output = @_;
my %fds = map { /([0-9]+) -> (.+)$/; ($1, $2) } @lines; # Split lines, keep only those which are symlinks.
my @lines = grep { /->/ } split("\n", $output);
# Filter out 0, 1, 2 (stdin, stdout, stderr). my %fds = map { /([0-9]+) -> (.+)$/; ($1, $2) } @lines;
delete $fds{0};
delete $fds{1};
delete $fds{2};
# Filter out the fd which is caused by ls calling readdir(). # Filter out 0, 1, 2 (stdin, stdout, stderr).
for my $fd (keys %fds) { delete $fds{0};
delete $fds{$fd} if $fds{$fd} =~ m,^/proc/\d+/fd$,; delete $fds{1};
delete $fds{2};
# filter out the fd which is caused by ls calling readdir().
for my $fd (keys %fds) {
delete $fds{$fd} if $fds{$fd} =~ m,^/proc/\d+/fd$,;
}
return %fds;
} }
is(scalar keys %fds, 0, 'No file descriptors leaked'); my %i3fds = extract_fds($i3output);
my %shfds = extract_fds($shoutput);
# Diff the fds to account for services that keep fds open, such as the System Security Services Daemon (sssd)
is(scalar keys %i3fds, scalar keys %shfds, 'No file descriptors leaked');
} }