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

diff --git a/t/edit.t b/t/edit.t
index 09e0cddd..2803dd01 100644
--- a/t/edit.t
+++ b/t/edit.t
@@ -1,24 +1,18 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # edit frontend behavior test (t/replace.t for backend)
 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;
 require PublicInbox::Config;
 use PublicInbox::MID qw(mid_clean);
 
-my @mods = qw(DBI DBD::SQLite);
-foreach my $mod (@mods) {
-	eval "require $mod";
-	plan skip_all => "missing $mod for $0" if $@;
-};
-
-my $tmpdir = tempdir('pi-edit-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+require_mods('DBD::SQLite');
+my ($tmpdir, $for_destroy) = tmpdir();
 my $inboxdir = "$tmpdir/v2";
 my $ibx = PublicInbox::Inbox->new({
 	inboxdir => $inboxdir,
@@ -130,7 +124,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");