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 63d45ac396bd31c8da6d694748e5092fe317cd3f..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
-               tcp_host_port test_lei 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));
@@ -459,6 +461,13 @@ our $lei = sub {
 
 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;
 }
@@ -467,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};
@@ -506,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: $!";
@@ -529,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);
@@ -544,7 +555,7 @@ sub setup_public_inboxes () {
        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";
        }