Skip to content
This repository has been archived by the owner on Apr 18, 2023. It is now read-only.

Commit

Permalink
tests: make sure to leave no tempfiles behind
Browse files Browse the repository at this point in the history
  • Loading branch information
stapelberg committed Sep 24, 2011
1 parent 10a9d2a commit 1eb011a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion testcases/complete-run.pl
Expand Up @@ -134,7 +134,7 @@ sub take_job {
my $dont_start = (slurp($test) =~ /# !NO_I3_INSTANCE!/);
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 "ipc-socket /tmp/nested-$display";
close($fh);
Expand Down
4 changes: 2 additions & 2 deletions testcases/t/59-socketpaths.t
Expand Up @@ -18,7 +18,7 @@ my $i3_path = abs_path("../i3");
# 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 "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1";
close($fh);
Expand Down Expand Up @@ -67,7 +67,7 @@ my $tmpdir = tempdir(CLEANUP => 1);
$socketpath = $tmpdir . "/config.sock";
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 "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1";
say $fh "ipc-socket $socketpath";
Expand Down
2 changes: 1 addition & 1 deletion testcases/t/71-config-migrate.t
Expand Up @@ -23,7 +23,7 @@ sub slurp {
sub migrate_config {
my ($config) = @_;

my ($fh, $tmpfile) = tempfile();
my ($fh, $tmpfile) = tempfile('/tmp/i3-migrate-cfg.XXXXXX', UNLINK => 1);
print $fh $config;
close($fh);

Expand Down
4 changes: 4 additions & 0 deletions testcases/t/lib/i3test.pm
Expand Up @@ -382,6 +382,10 @@ sub exit_gracefully {
if (!$exited) {
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
Expand Down

0 comments on commit 1eb011a

Please sign in to comment.