fetch: fix half-baked v1 manifest.js.gz handling

[public-inbox.git] / t / lei-externals.t

diff --git a/t/lei-externals.t b/t/lei-externals.t
index 2291dd992b619ee3a08ec3a9cbbac105b4872dd7..5e3c67bc638ed80ef6f9ff72cf82cc0354d24332 100644 (file)
--- a/t/lei-externals.t
+++ b/t/lei-externals.t
@@ -4,14 +4,14 @@
 use strict; use v5.10.1; use PublicInbox::TestCommon;
 use Fcntl qw(SEEK_SET);
 use PublicInbox::Spawn qw(which);
-use PublicInbox::OnDestroy;
 require_git 2.6;
 require_mods(qw(json DBD::SQLite Search::Xapian));
 use POSIX qw(WTERMSIG WIFSIGNALED SIGPIPE);
 
-my @onions = qw(http://hjrcffqmbrq6wope.onion/meta/
-       http://czquwvybam4bgbro.onion/meta/
-       http://ou63pmih66umazou.onion/meta/);
+my @onions = map { "http://$_.onion/meta/" } qw(
+       4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd
+       ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd
+       7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd);
 
 my $test_external_remote = sub {
        my ($url, $k) = @_;
@@ -211,6 +211,8 @@ test_lei(sub {
                like($lei_out, qr/use boolean prefix/, '--stdin on pipe');
        }
        ok(!lei(qw(q -q --stdin s:use)), "--stdin and argv don't mix");
+       like($lei_err, qr/no query allowed.*--stdin/,
+               '--stdin conflict error message');
 
        for my $fmt (qw(ldjson ndjson jsonl)) {
                lei_ok('q', '-f', $fmt, 's:use boolean prefix');
@@ -250,6 +252,8 @@ test_lei(sub {
        }
        ok(!lei('q', '-o', "$home/mbox", 's:nope'),
                        'fails if mbox format unspecified');
+       like($lei_err, qr/unable to determine mbox/, 'mbox-related message');
+
        ok(!lei(qw(q --no-local s:see)), '--no-local');
        is($? >> 8, 1, 'proper exit code');
        like($lei_err, qr/no local or remote.+? to search/, 'no inbox');
@@ -266,10 +270,6 @@ test_lei(sub {
        {
                skip 'TEST_LEI_DAEMON_PERSIST_DIR in use', 1 if
                                        $ENV{TEST_LEI_DAEMON_PERSIST_DIR};
-               opendir my $dh, '.' or BAIL_OUT "opendir(.) $!";
-               my $od = PublicInbox::OnDestroy->new($$, sub {
-                       chdir $dh or BAIL_OUT "chdir: $!"
-               });
                my @q = qw(q -o mboxcl2:rel.mboxcl2 bye);
                lei_ok('-C', $home, @q);
                is(unlink("$home/rel.mboxcl2"), 1, '-C works before q');