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

tests: make sure to leave no tempfiles behind

This commit is contained in:
Michael Stapelberg 2011-09-24 16:28:21 +01:00
parent 10a9d2a439
commit 1eb011aae1
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testcases/complete-run.pl
View File

@ -134,7 +134,7 @@ sub take_job {
my $dont_start = (slurp($test) =~ /# !NO_I3_INSTANCE!/); my $dont_start = (slurp($test) =~ /# !NO_I3_INSTANCE!/);
my $logpath = "$outdir/i3-log-for-" . basename($test); my $logpath = "$outdir/i3-log-for-" . basename($test);
my ($fh, $tmpfile) = tempfile(); my ($fh, $tmpfile) = tempfile('i3-run-cfg.XXXXXX', UNLINK => 1);
say $fh $config; say $fh $config;
say $fh "ipc-socket /tmp/nested-$display"; say $fh "ipc-socket /tmp/nested-$display";
close($fh); close($fh);

4
testcases/t/59-socketpaths.t
View File

@ -18,7 +18,7 @@ my $i3_path = abs_path("../i3");
# default case: socket will be created in /tmp/i3-<username>/ipc-socket.<pid> # default case: socket will be created in /tmp/i3-<username>/ipc-socket.<pid>
##################################################################### #####################################################################
my ($fh, $tmpfile) = tempfile(); my ($fh, $tmpfile) = tempfile('/tmp/i3-test-config.XXXXXX', UNLINK => 1);
say $fh "# i3 config file (v4)"; say $fh "# i3 config file (v4)";
say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1";
close($fh); close($fh);
@ -67,7 +67,7 @@ my $tmpdir = tempdir(CLEANUP => 1);
$socketpath = $tmpdir . "/config.sock"; $socketpath = $tmpdir . "/config.sock";
ok(! -e $socketpath, "$socketpath does not exist yet"); ok(! -e $socketpath, "$socketpath does not exist yet");
($fh, $tmpfile) = tempfile(); ($fh, $tmpfile) = tempfile('/tmp/i3-test-config.XXXXXX', UNLINK => 1);
say $fh "# i3 config file (v4)"; say $fh "# i3 config file (v4)";
say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1";
say $fh "ipc-socket $socketpath"; say $fh "ipc-socket $socketpath";

2
testcases/t/71-config-migrate.t
View File

@ -23,7 +23,7 @@ sub slurp {
sub migrate_config { sub migrate_config {
my ($config) = @_; my ($config) = @_;
my ($fh, $tmpfile) = tempfile(); my ($fh, $tmpfile) = tempfile('/tmp/i3-migrate-cfg.XXXXXX', UNLINK => 1);
print $fh $config; print $fh $config;
close($fh); close($fh);

4
testcases/t/lib/i3test.pm
View File

@ -382,6 +382,10 @@ sub exit_gracefully {
if (!$exited) { if (!$exited) {
kill(9, $pid) or die "could not kill i3"; kill(9, $pid) or die "could not kill i3";
} }
if ($socketpath =~ m,^/tmp/i3-test-socket-,) {
unlink($socketpath);
}
} }
# Gets the socket path from the I3_SOCKET_PATH atom stored on the X11 root window # Gets the socket path from the I3_SOCKET_PATH atom stored on the X11 root window