ds: remove Timer->cancel and Timer class+bless

[public-inbox.git] / t / solver_git.t

diff --git a/t/solver_git.t b/t/solver_git.t
index 67ae02e63877131a461388bc04f2484c326100b2..92402c3a16768b88aea7347254cfcb9f2a78952f 100644 (file)
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -6,8 +6,8 @@ use Test::More;
 use Cwd qw(abs_path);
 use PublicInbox::TestCommon;
 require_git(2.6);
-use PublicInbox::Spawn qw(spawn);
-require_mods(qw(DBD::SQLite Search::Xapian));
+use PublicInbox::Spawn qw(popen_rd);
+require_mods(qw(DBD::SQLite Search::Xapian Plack::Util));
 chomp(my $git_dir = `git rev-parse --git-dir 2>/dev/null`);
 plan skip_all => "$0 must be run from a git working tree" if $?;
 
@@ -42,7 +42,8 @@ $ibx->{-repo_objs} = [ $git ];
 my $res;
 my $solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] });
 open my $log, '+>>', "$inboxdir/solve.log" or die "open: $!";
-my $psgi_env = { 'psgi.errors' => *STDERR, 'psgi.url_scheme' => 'http' };
+my $psgi_env = { 'psgi.errors' => *STDERR, 'psgi.url_scheme' => 'http',
+               'HTTP_HOST' => 'example.com' };
 $solver->solve($psgi_env, $log, '69df7d5', {});
 ok($res, 'solved a blob!');
 my $wt_git = $res->[0];
@@ -119,14 +120,13 @@ SKIP: {
        my $cmd = [ qw(git hash-object -w --stdin) ];
        my $env = { GIT_DIR => $binfoo };
        while (my ($label, $size) = each %bin) {
-               pipe(my ($rout, $wout)) or die;
                pipe(my ($rin, $win)) or die;
-               my $rdr = { 0 => $rin, 1 => $wout };
-               my $pid = spawn($cmd , $env, $rdr);
-               $wout = $rin = undef;
+               my $rout = popen_rd($cmd , $env, { 0 => $rin });
+               $rin = undef;
                print { $win } ("\0" x $size) or die;
                close $win or die;
                chomp($oid{$label} = <$rout>);
+               close $rout or die "$?";
        }
 
        # ensure the PSGI frontend (ViewVCS) works: