X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnulsubject.t;h=03b1ee80e711d13dbe1000b4f7a9b27b2bc7c202;hb=b714ab45d30d6f0298d73ef4281c1d0263a02493;hp=bb05be8589e71ceda4875e7f88cc6cec3bfe36db;hpb=aca47e05a6026c12c768753c87e6ff769ef6bee4;p=public-inbox.git

diff --git a/t/nulsubject.t b/t/nulsubject.t
index bb05be85..03b1ee80 100644
--- a/t/nulsubject.t
+++ b/t/nulsubject.t
@@ -1,31 +1,30 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-use File::Temp qw/tempdir/;
+use PublicInbox::TestCommon;
 
 use_ok 'PublicInbox::Import';
 use_ok 'PublicInbox::Git';
-my $tmpdir = tempdir('pi-nulsubject-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $git_dir = "$tmpdir/a.git";
 
 {
-	is(system(qw(git init -q --bare), $git_dir), 0, 'git init ok');
 	my $git = PublicInbox::Git->new($git_dir);
 	my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
-	$im->add(Email::MIME->create(
-		header => [
-			From => 'a@example.com',
-			To => 'b@example.com',
-			'Content-Type' => 'text/plain',
-			Subject => ' A subject line with a null =?iso-8859-1?q?=00?= see!',
-			'Message-ID' => '<null-test.a@example.com>',
-		],
-		body => "hello world\n",
-	));
+	$im->init_bare;
+	$im->add(PublicInbox::MIME->new(<<'EOF'));
+From: a@example.com
+To: b@example.com
+Subject: A subject line with a null =?iso-8859-1?q?=00?= see!
+Message-ID: <null-test.a@example.com>
+
+hello world
+EOF
 	$im->done;
-	is(system(qw(git --git-dir), $git_dir, 'fsck', '--strict'), 0, 'git fsck ok');
+	is(xsys(qw(git --git-dir), $git_dir, 'fsck', '--strict'), 0,
+		'git fsck ok');
 }
 
 done_testing();