X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fedit.t;h=9a78b45d3d95c9adef49f4817f914c7b112d7554;hb=3c313f9034aac96182e2efdc2f92c40803626f32;hp=09e0cdddf4cb7e0c8bd0c4b4c364008f2282dd92;hpb=6f23376be94dd81cb8f3046189811057519a0175;p=public-inbox.git

diff --git a/t/edit.t b/t/edit.t
index 09e0cddd..9a78b45d 100644
--- a/t/edit.t
+++ b/t/edit.t
@@ -4,8 +4,7 @@
 use strict;
 use warnings;
 use Test::More;
-use File::Temp qw/tempdir/;
-require './t/common.perl';
+use PublicInbox::TestCommon;
 require_git(2.6);
 require PublicInbox::Inbox;
 require PublicInbox::InboxWritable;
@@ -18,7 +17,7 @@ foreach my $mod (@mods) {
 	plan skip_all => "missing $mod for $0" if $@;
 };
 
-my $tmpdir = tempdir('pi-edit-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $inboxdir = "$tmpdir/v2";
 my $ibx = PublicInbox::Inbox->new({
 	inboxdir => $inboxdir,
@@ -130,7 +129,6 @@ $t = 'mailEditor set in config'; {
 	is($rc, 0, 'set publicinbox.mailEditor');
 	local $ENV{MAIL_EDITOR};
 	delete $ENV{MAIL_EDITOR};
-	delete local $ENV{MAIL_EDITOR};
 	local $ENV{GIT_EDITOR} = 'echo should not run';
 	$cmd = [ '-edit', "-m$mid", $inboxdir ];
 	ok(run_script($cmd, undef, $opt), "$t edited message");