X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=dbbc37b8d3e5d43a5e7180b7fd6d939ba8ed6732;hb=5dbb060037ce3e3a3ba0812baa90c80eeee762af;hp=30233ce0c3b186ba8dd4d813183d8d81e874584a;hpb=cf4cbaac260b5c24ed7173c39e0e18c0f0deb89f;p=public-inbox.git

diff --git a/t/nntpd.t b/t/nntpd.t
index 30233ce0..dbbc37b8 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -7,7 +7,7 @@ use PublicInbox::Eml;
 use Socket qw(IPPROTO_TCP TCP_NODELAY);
 use Sys::Hostname;
 use POSIX qw(_exit);
-use Digest::SHA;
+use PublicInbox::SHA;
 
 # t/nntpd-v2.t wraps this for v2
 my $version = $ENV{PI_TEST_VERSION} || 1;
@@ -304,7 +304,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
 			my %sums;
 			for (1..$nart) {
 				<$s> =~ /\A220 / or _exit(4);
-				my $dig = Digest::SHA->new(1);
+				my $dig = PublicInbox::SHA->new(1);
 				while (my $l = <$s>) {
 					last if $l eq ".\r\n";
 					$dig->add($l);
@@ -365,7 +365,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
 		($^O =~ /\A(?:linux)\z/) or
 			skip "lsof /(deleted)/ check untested on $^O", 1;
 		my @lsof = xqx([$lsof, '-p', $td->{pid}], undef, $noerr);
-		my $d = [ grep(/\(deleted\)/, @lsof) ];
+		my $d = [ grep(/\(deleted\)/, grep(!/batch-command\.err/, @lsof)) ];
 		is_deeply($d, [], 'no deleted files') or diag explain($d);
 	};
 	SKIP: { test_watch($tmpdir, $host_port, $group) };
@@ -413,7 +413,7 @@ sub test_watch {
 	use_ok 'PublicInbox::Watch';
 	use_ok 'PublicInbox::InboxIdle';
 	use_ok 'PublicInbox::Config';
-	require_git('1.8.5', 1) or skip('git 1.8.5+ needed for --urlmatch', 4);
+	require_git('1.8.5', 4);
 	my $old_env = { HOME => $ENV{HOME} };
 	my $home = "$tmpdir/watch_home";
 	mkdir $home or BAIL_OUT $!;