From 5cddfa50765d59157e15488c235fe01202db0972 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 3 Mar 2016 09:07:40 +0000 Subject: t/*.t: use identifiable tempdir names This should make identifiying leftover directories due to SIGKILL-ed tests easier. --- t/cgi.t | 2 +- t/config.t | 2 +- t/feed.t | 2 +- t/git.t | 2 +- t/html_index.t | 2 +- t/httpd-corner.t | 2 +- t/httpd.t | 2 +- t/init.t | 2 +- t/mda.t | 2 +- t/msgmap.t | 2 +- t/nntpd.t | 2 +- t/plack.t | 2 +- t/search.t | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/t/cgi.t b/t/cgi.t index ebf14160..f1a2730c 100644 --- a/t/cgi.t +++ b/t/cgi.t @@ -11,7 +11,7 @@ use IPC::Run qw/run/; use constant CGI => "blib/script/public-inbox.cgi"; my $mda = "blib/script/public-inbox-mda"; my $index = "blib/script/public-inbox-index"; -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-cgi-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $home = "$tmpdir/pi-home"; my $pi_home = "$home/.public-inbox"; my $pi_config = "$pi_home/config"; diff --git a/t/config.t b/t/config.t index 88ed62a4..48df0871 100644 --- a/t/config.t +++ b/t/config.t @@ -5,7 +5,7 @@ use warnings; use Test::More; use PublicInbox::Config; use File::Temp qw/tempdir/; -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1); { is(system(qw(git init -q --bare), $tmpdir), 0, "git init successful"); diff --git a/t/feed.t b/t/feed.t index 71cbb735..73b7d0bb 100644 --- a/t/feed.t +++ b/t/feed.t @@ -15,7 +15,7 @@ sub string_feed { stream_to_string(PublicInbox::Feed::generate($_[0])); } -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-feed-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $git_dir = "$tmpdir/gittest"; { diff --git a/t/git.t b/t/git.t index 19fbef15..0f3dbae3 100644 --- a/t/git.t +++ b/t/git.t @@ -4,7 +4,7 @@ use strict; use warnings; use Test::More; use File::Temp qw/tempdir/; -my $dir = tempdir(CLEANUP => 1); +my $dir = tempdir('pi-git-XXXXXX', TMPDIR => 1, CLEANUP => 1); use Cwd qw/getcwd/; use_ok 'PublicInbox::Git'; diff --git a/t/html_index.t b/t/html_index.t index 50f5ae5e..adbadaf4 100644 --- a/t/html_index.t +++ b/t/html_index.t @@ -6,7 +6,7 @@ use Test::More; use Email::Simple; use PublicInbox::Feed; use File::Temp qw/tempdir/; -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-http-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $git_dir = "$tmpdir/gittest"; # setup diff --git a/t/httpd-corner.t b/t/httpd-corner.t index 40692086..e73ebd5e 100644 --- a/t/httpd-corner.t +++ b/t/httpd-corner.t @@ -19,7 +19,7 @@ use IO::Socket; use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD :seek); use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY); use POSIX qw(dup2 mkfifo :sys_wait_h); -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('httpd-corner-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $fifo = "$tmpdir/fifo"; ok(defined mkfifo($fifo, 0777), 'created FIFO'); my $err = "$tmpdir/stderr.log"; diff --git a/t/httpd.t b/t/httpd.t index ad636fc1..25b4f418 100644 --- a/t/httpd.t +++ b/t/httpd.t @@ -17,7 +17,7 @@ use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY); use IPC::Run; # FIXME: too much setup -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-httpd-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $home = "$tmpdir/pi-home"; my $err = "$tmpdir/stderr.log"; my $out = "$tmpdir/stdout.log"; diff --git a/t/init.t b/t/init.t index 8989557c..b78fbaf5 100644 --- a/t/init.t +++ b/t/init.t @@ -5,7 +5,7 @@ use warnings; use Test::More; use PublicInbox::Config; use File::Temp qw/tempdir/; -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-init-XXXXXX', TMPDIR => 1, CLEANUP => 1); use constant pi_init => 'blib/script/public-inbox-init'; { diff --git a/t/mda.t b/t/mda.t index a8e78b38..03bad871 100644 --- a/t/mda.t +++ b/t/mda.t @@ -11,7 +11,7 @@ use IPC::Run qw(run); my $mda = "blib/script/public-inbox-mda"; my $learn = "blib/script/public-inbox-learn"; -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-mda-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $home = "$tmpdir/pi-home"; my $pi_home = "$home/.public-inbox"; my $pi_config = "$pi_home/config"; diff --git a/t/msgmap.t b/t/msgmap.t index 6a4f4f84..5c28e54d 100644 --- a/t/msgmap.t +++ b/t/msgmap.t @@ -11,7 +11,7 @@ foreach my $mod (qw(DBD::SQLite)) { } use_ok 'PublicInbox::Msgmap'; -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-msgmap-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $d = PublicInbox::Msgmap->new($tmpdir, 1); my %mid2num; diff --git a/t/nntpd.t b/t/nntpd.t index d8c2e7b3..d597855b 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -18,7 +18,7 @@ use File::Temp qw/tempdir/; use Net::NNTP; use IPC::Run qw(run); -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $home = "$tmpdir/pi-home"; my $err = "$tmpdir/stderr.log"; my $out = "$tmpdir/stdout.log"; diff --git a/t/plack.t b/t/plack.t index b77cdba5..568f09f0 100644 --- a/t/plack.t +++ b/t/plack.t @@ -9,7 +9,7 @@ use Cwd; use IPC::Run qw/run/; my $psgi = "examples/public-inbox.psgi"; my $mda = "blib/script/public-inbox-mda"; -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-plack-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $home = "$tmpdir/pi-home"; my $pi_home = "$home/.public-inbox"; my $pi_config = "$pi_home/config"; diff --git a/t/search.t b/t/search.t index df5a5d36..bbf1a89f 100644 --- a/t/search.t +++ b/t/search.t @@ -7,7 +7,7 @@ eval { require PublicInbox::SearchIdx; }; plan skip_all => "Xapian missing for search" if $@; use File::Temp qw/tempdir/; use Email::MIME; -my $tmpdir = tempdir(CLEANUP => 1); +my $tmpdir = tempdir('pi-search-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $git_dir = "$tmpdir/a.git"; my ($root_id, $last_id); -- cgit v1.2.3-24-ge0c7