tests: setup_public_inboxes: use IMAP-friendly newsgroups

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

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index c861dc5dfbb2add815363ec4ad69259cb6359d98..c5070cfd43b020f32927dac557e8d521aba0bfe7 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -9,12 +9,14 @@ use v5.10.1;
 use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD :seek);
 use POSIX qw(dup2);
 use IO::Socket::INET;
+use File::Spec;
 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 setup_public_inboxes
-               test_lei $lei $lei_out $lei_err $lei_opt);
+               tcp_host_port test_lei lei lei_ok
+               $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 +42,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 +271,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 +459,15 @@ our $lei = sub {
        $res;
 };
 
+sub lei (@) { $lei->(@_) }
+
+sub lei_ok (@) {
+       my $msg = ref($_[-1]) ? pop(@_) : undef;
+       # filter out anything that looks like a path name for consistent logs
+       my @msg = grep(!m!\A/!, @_);
+       ok($lei->(@_), "lei @msg". ($msg ? " ($$msg)" : ''));
+}
+
 sub json_utf8 () {
        state $x = ref(PublicInbox::Config->json)->new->utf8->canonical;
 }
@@ -444,7 +476,7 @@ sub test_lei {
 SKIP: {
        my ($cb) = pop @_;
        my $test_opt = shift // {};
-       require_git(2.6) or skip('git 2.6+ required for lei test', 2);
+       require_git(2.6, 1) or skip('git 2.6+ required for lei test', 2);
        require_mods(qw(json DBD::SQLite Search::Xapian), 2);
        require PublicInbox::Config;
        delete local $ENV{XDG_DATA_HOME};
@@ -461,8 +493,9 @@ SKIP: {
 Socket::MsgHdr missing or Inline::C is unconfigured/missing
 EOM
        $lei_opt = { 1 => \$lei_out, 2 => \$lei_err };
-       my $daemon_pid;
-       my ($tmpdir, $for_destroy) = tmpdir();
+       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";
@@ -482,6 +515,8 @@ EOM
                }
        }; # SKIP for lei_daemon
        unless ($test_opt->{daemon_only}) {
+               $ENV{TEST_LEI_DAEMON_ONLY} and
+                       skip 'TEST_LEI_DAEMON_ONLY set', 1;
                require_ok 'PublicInbox::LEI';
                my $home = "$tmpdir/lei-oneshot";
                mkdir($home, 0700) or BAIL_OUT "mkdir: $!";
@@ -505,7 +540,7 @@ EOM
 # 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 $test_home = "t/home2";
        my $pi_config = "$test_home/.public-inbox/config";
        my $stamp = "$test_home/setup-stamp";
        my @ret = ($test_home, $pi_config);
@@ -517,14 +552,15 @@ sub setup_public_inboxes () {
        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",
+                               '--newsgroup', "t.v$V",
                                "$test_home/t$V", "http://example.com/t$V",
                                "t$V\@example.com" ]) or BAIL_OUT "init v$V";
        }
+       require PublicInbox::Config;
+       require PublicInbox::InboxWritable;
        my $cfg = PublicInbox::Config->new;
        my $seen = 0;
        $cfg->each_inbox(sub {