user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH] t/init.t: don't modify ~/.public-inbox/
Date: Sun, 26 Jul 2020 09:03:15 +0000	[thread overview]
Message-ID: <20200726090315.10068-1-e@yhbt.net> (raw)

Tests for failures should not leave junk temporary files lying
around in a users' ~/.public-inbox/.

On a side note, I'm not sure if PI_DIR is or was ever
necessary.  It's never been documented, so perhaps
using $HOME for this is better...
---
 script/public-inbox-init | 2 ++
 t/init.t                 | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/script/public-inbox-init b/script/public-inbox-init
index 951338af0..b8d71f351 100755
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -53,6 +53,7 @@ PublicInbox::Lock::lock_acquire($lock_obj);
 
 # git-config will operate on this (and rename on success):
 my ($fh, $pi_config_tmp) = tempfile('pi-init-XXXXXXXX', DIR => $dir);
+my $cfg_tmp = UnlinkMe->new($pi_config_tmp);
 
 # Now, we grab another lock to use git-config(1) locking, so it won't
 # wait on the lock, unlike some of our internal flock()-based locks.
@@ -176,6 +177,7 @@ if (defined $perm) {
 
 rename $pi_config_tmp, $pi_config or
 	die "failed to rename `$pi_config_tmp' to `$pi_config': $!\n";
+delete $cfg_tmp->{file};
 $auto_unlink->DESTROY;
 
 package UnlinkMe;
diff --git a/t/init.t b/t/init.t
index b8f17b5c4..165819554 100644
--- a/t/init.t
+++ b/t/init.t
@@ -50,12 +50,15 @@ sub quiet_fail {
 		'-init did not unlink lock on failure');
 }
 {
+	my $env = { PI_DIR => "$tmpdir/.public-inbox/" };
 	my $rdr = { 2 => \(my $err = '') };
 	my $cmd = [ '-init', 'alist', "$tmpdir/a\nlist",
 		   qw(http://example.com/alist alist@example.com) ];
-	ok(!run_script($cmd, undef, $rdr),
+	ok(!run_script($cmd, $env, $rdr),
 		'public-inbox-init rejects LF in inboxdir');
 	like($err, qr/`\\n' not allowed in `/s, 'reported \\n');
+	is_deeply([glob("$tmpdir/.public-inbox/pi-init-*")], [],
+		'no junk files left behind');
 }
 
 SKIP: {

                 reply	other threads:[~2020-07-26  9:03 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200726090315.10068-1-e@yhbt.net \
    --to=e@yhbt.net \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).