lei: split out MdirReader package, lazy-require earlier

[public-inbox.git] / lib / PublicInbox / TestCommon.pm

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 2b78731b8e54ec877c9fdc9631afaf823b94a95e..53f134371e046342b14c35644eb1975f6c8333b0 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -13,8 +13,8 @@ our @EXPORT;
 BEGIN {
        @EXPORT = qw(tmpdir tcp_server tcp_connect require_git require_mods
                run_script start_script key2sub xsys xsys_e xqx eml_load tick
-               have_xapian_compact json_utf8
-               test_lei $lei $lei_out $lei_err $lei_opt);
+               have_xapian_compact json_utf8 setup_public_inboxes
+               tcp_host_port test_lei lei $lei $lei_out $lei_err $lei_opt);
        require Test::More;
        my @methods = grep(!/\W/, @Test::More::EXPORT);
        eval(join('', map { "*$_=\\&Test::More::$_;" } @methods));
@@ -40,20 +40,38 @@ sub tmpdir (;$) {
 }
 
 sub tcp_server () {
-       IO::Socket::INET->new(
-               LocalAddr => '127.0.0.1',
+       my %opt = (
                ReuseAddr => 1,
                Proto => 'tcp',
                Type => Socket::SOCK_STREAM(),
                Listen => 1024,
                Blocking => 0,
-       ) or BAIL_OUT "failed to create TCP server: $!";
+       );
+       eval {
+               die 'IPv4-only' if $ENV{TEST_IPV4_ONLY};
+               require IO::Socket::INET6;
+               IO::Socket::INET6->new(%opt, LocalAddr => '[::1]')
+       } || eval {
+               die 'IPv6-only' if $ENV{TEST_IPV6_ONLY};
+               IO::Socket::INET->new(%opt, LocalAddr => '127.0.0.1')
+       } || BAIL_OUT "failed to create TCP server: $! ($@)";
+}
+
+sub tcp_host_port ($) {
+       my ($s) = @_;
+       my ($h, $p) = ($s->sockhost, $s->sockport);
+       my $ipv4 = $s->sockdomain == Socket::AF_INET();
+       if (wantarray) {
+               $ipv4 ? ($h, $p) : ("[$h]", $p);
+       } else {
+               $ipv4 ? "$h:$p" : "[$h]:$p";
+       }
 }
 
 sub tcp_connect {
        my ($dest, %opt) = @_;
-       my $addr = $dest->sockhost . ':' . $dest->sockport;
-       my $s = IO::Socket::INET->new(
+       my $addr = tcp_host_port($dest);
+       my $s = ref($dest)->new(
                Proto => 'tcp',
                Type => Socket::SOCK_STREAM(),
                PeerAddr => $addr,
@@ -251,6 +269,9 @@ sub run_script ($;$$) {
                        die "unable to deal with $ref $redir";
                }
        }
+       if ($key =~ /-(index|convert|extindex|convert|xcpdb)\z/) {
+               unshift @argv, '--no-fsync';
+       }
        if ($run_mode == 0) {
                # spawn an independent new process, like real-world use cases:
                require PublicInbox::Spawn;
@@ -436,6 +457,8 @@ our $lei = sub {
        $res;
 };
 
+sub lei (@) { $lei->(@_) }
+
 sub json_utf8 () {
        state $x = ref(PublicInbox::Config->json)->new->utf8->canonical;
 }
@@ -456,13 +479,16 @@ SKIP: {
        require PublicInbox::Spawn;
        state $lei_daemon = PublicInbox::Spawn->can('send_cmd4') ||
                                eval { require Socket::MsgHdr; 1 };
-       $lei_opt = { 1 => \$lei_out, 2 => \$lei_err };
-       my $daemon_pid;
-       my ($tmpdir, $for_destroy) = tmpdir();
-       SKIP: {
-               skip <<'EOM', 1 unless $lei_daemon;
+       # XXX fix and move this inside daemon-only before 1.7 release
+       skip <<'EOM', 1 unless $lei_daemon;
 Socket::MsgHdr missing or Inline::C is unconfigured/missing
 EOM
+       $lei_opt = { 1 => \$lei_out, 2 => \$lei_err };
+       my ($daemon_pid, $for_destroy);
+       my $tmpdir = $test_opt->{tmpdir};
+       ($tmpdir, $for_destroy) = tmpdir unless $tmpdir;
+       SKIP: {
+               skip 'TEST_LEI_ONESHOT set', 1 if $ENV{TEST_LEI_ONESHOT};
                my $home = "$tmpdir/lei-daemon";
                mkdir($home, 0700) or BAIL_OUT "mkdir: $!";
                local $ENV{HOME} = $home;
@@ -498,7 +524,53 @@ EOM
                ok(!kill(0, $daemon_pid), "$t daemon stopped after oneshot");
        }
 }; # SKIP if missing git 2.6+ || Xapian || SQLite || json
-}
+} # /test_lei
+
+# returns the pathname to a ~/.public-inbox/config in scalar context,
+# ($test_home, $pi_config_pathname) in list context
+sub setup_public_inboxes () {
+       my $test_home = "t/home1";
+       my $pi_config = "$test_home/.public-inbox/config";
+       my $stamp = "$test_home/setup-stamp";
+       my @ret = ($test_home, $pi_config);
+       return @ret if -f $stamp;
+
+       require PublicInbox::Lock;
+       my $lk = bless { lock_path => "$test_home/setup.lock" },
+                       'PublicInbox::Lock';
+       my $end = $lk->lock_for_scope;
+       return @ret if -f $stamp;
+
+       require PublicInbox::InboxWritable;
+       local $ENV{PI_CONFIG} = $pi_config;
+       for my $V (1, 2) {
+               run_script([qw(-init), "-V$V", "t$V",
+                               '--newsgroup', "t.$V",
+                               "$test_home/t$V", "http://example.com/t$V",
+                               "t$V\@example.com" ]) or BAIL_OUT "init v$V";
+       }
+       my $cfg = PublicInbox::Config->new;
+       my $seen = 0;
+       $cfg->each_inbox(sub {
+               my ($ibx) = @_;
+               my $im = PublicInbox::InboxWritable->new($ibx)->importer(0);
+               my $V = $ibx->version;
+               my @eml = (glob('t/*.eml'), 't/data/0001.patch');
+               for (@eml) {
+                       next if $_ eq 't/psgi_v2-old.eml'; # dup mid
+                       $im->add(eml_load($_)) or BAIL_OUT "v$V add $_";
+                       $seen++;
+               }
+               $im->done;
+               if ($V == 1) {
+                       run_script(['-index', $ibx->{inboxdir}]) or
+                               BAIL_OUT 'index v1';
+               }
+       });
+       $seen or BAIL_OUT 'no imports';
+       open my $fh, '>', $stamp or BAIL_OUT "open $stamp: $!";
+       @ret;
+};
 
 package PublicInboxTestProcess;
 use strict;