1 files changed, 22 insertions, 15 deletions

diff --git a/xt/solver.t b/xt/solver.t
index 40a5f81f..372d003b 100644
--- a/xt/solver.t
+++ b/xt/solver.t
@@ -5,11 +5,12 @@ use v5.12;
 use PublicInbox::TestCommon;
 use PublicInbox::Config; # this relies on PI_CONFIG // ~/.public-inbox/config
 my @psgi = qw(HTTP::Request::Common Plack::Test URI::Escape Plack::Builder);
-require_mods(qw(DBD::SQLite Search::Xapian), @psgi);
+require_mods(qw(DBD::SQLite Xapian), @psgi);
 use_ok($_) for @psgi;
 use_ok 'PublicInbox::WWW';
 my $cfg = PublicInbox::Config->new;
 my $www = PublicInbox::WWW->new($cfg);
+$www->preload;
 my $app = sub {
         my $env = shift;
         $env->{'psgi.errors'} = \*STDERR;
@@ -30,24 +31,32 @@ my $todo = {
                 '96f1c7f/s/', # TODO: b=contrib/completion/git-completion.bash
                 'b76f2c0/s/?b=po/zh_CN.po',
                 'c2f3bf071ee90b01f2d629921bb04c4f798f02fa/s/', # tag
+                '7eb93c89651c47c8095d476251f2e4314656b292/s/', # non-UTF-8
         ],
+        'sox-devel' => [
+                'c38987e8d20505621b8d872863afa7d233ed1096/s/', # non-UTF-8
+        ]
 };
 
-my ($ibx_name, $urls, @gone);
+my @gone;
 my $client = sub {
         my ($cb) = @_;
-        for (@$urls) {
-                my $url = "/$ibx_name/$_";
-                my $res = $cb->(GET($url));
-                is($res->code, 200, $url);
-                next if $res->code == 200;
-                diag "$url failed";
-                diag $res->content;
+        for my $ibx_name (sort keys %$todo) {
+                diag "testing $ibx_name";
+                my $urls = $todo->{$ibx_name};
+                for my $u (@$urls) {
+                        my $url = "/$ibx_name/$u";
+                        my $res = $cb->(GET($url));
+                        is($res->code, 200, $url);
+                        next if $res->code == 200;
+                        diag "$url failed";
+                        diag $res->content;
+                }
         }
 };
 
 my $nr = 0;
-while (($ibx_name, $urls) = each %$todo) {
+while (my ($ibx_name, $urls) = each %$todo) {
         SKIP: {
                 my $ibx = $cfg->lookup_name($ibx_name);
                 if (!$ibx) {
@@ -55,20 +64,18 @@ while (($ibx_name, $urls) = each %$todo) {
                         skip(qq{[publicinbox "$ibx_name"] not configured},
                                 scalar(@$urls));
                 }
-                if (!defined($ibx->{coderepo})) {
+                if (!defined($ibx->{-repo_objs})) {
                         push @gone, $ibx_name;
                         skip(qq{publicinbox.$ibx_name.coderepo not configured},
                                 scalar(@$urls));
                 }
-                test_psgi($app, $client);
                 $nr++;
         }
 }
 
 delete @$todo{@gone};
+test_psgi($app, $client);
 my $env = { PI_CONFIG => PublicInbox::Config->default_file };
-while (($ibx_name, $urls) = each %$todo) {
-        test_httpd($env, $client, $nr);
-}
+test_httpd($env, $client, $nr);
 
 done_testing();