* [PATCH 2/3] t/lei-index: IMAP and NNTP dependencies are optional
2021-09-27 21:05 5% ` [PATCH 0/3] fixes for odd/old/missing dependencies Eric Wong
@ 2021-09-27 21:05 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-09-27 21:05 UTC (permalink / raw)
To: meta; +Cc: Konstantin Ryabitsev
"lei index" support for IMAP and NNTP is incomplete, so there's
no point in requiring them.
Reported-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Link: https://public-inbox.org/meta/20210927124056.kj5okiefvs4ztk27@meerkat.local/
---
t/lei-index.t | 35 +++++++++++++++++++++++------------
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/t/lei-index.t b/t/lei-index.t
index eeda5196f411..aab8f7e63f06 100644
--- a/t/lei-index.t
+++ b/t/lei-index.t
@@ -3,21 +3,30 @@
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict; use v5.10.1; use PublicInbox::TestCommon;
use File::Spec;
-require_mods(qw(lei -nntpd));
+require_mods(qw(lei));
my ($ro_home, $cfg_path) = setup_public_inboxes;
my ($tmpdir, $for_destroy) = tmpdir;
my $env = { PI_CONFIG => $cfg_path };
+my $srv = {};
-my $sock = tcp_server;
-my $cmd = [ '-nntpd', '-W0', "--stdout=$tmpdir/n1", "--stderr=$tmpdir/n2" ];
-my $nntpd = start_script($cmd, $env, { 3 => $sock }) or BAIL_OUT("-nntpd $?");
-my $nntp_host_port = tcp_host_port($sock);
+SKIP: {
+ require_mods(qw(-nntpd Net::NNTP), 1);
+ my $rdr = { 3 => tcp_server };
+ $srv->{nntpd} = start_script(
+ [qw(-nntpd -W0), "--stdout=$tmpdir/n1", "--stderr=$tmpdir/n2"],
+ $env, $rdr) or xbail "nntpd: $?";
+ $srv->{nntp_host_port} = tcp_host_port($rdr->{3});
+}
+
+SKIP: {
+ require_mods(qw(-imapd Mail::IMAPClient), 1);
+ my $rdr = { 3 => tcp_server };
+ $srv->{imapd} = start_script(
+ [qw(-imapd -W0), "--stdout=$tmpdir/i1", "--stderr=$tmpdir/i2"],
+ $env, $rdr) or xbail("-imapd $?");
+ $srv->{imap_host_port} = tcp_host_port($rdr->{3});
+}
-$sock = tcp_server;
-$cmd = [ '-imapd', '-W0', "--stdout=$tmpdir/i1", "--stderr=$tmpdir/i2" ];
-my $imapd = start_script($cmd, $env, { 3 => $sock }) or BAIL_OUT("-imapd $?");
-my $imap_host_port = tcp_host_port($sock);
-undef $sock;
for ('', qw(cur new)) {
mkdir "$tmpdir/md/$_" or xbail "mkdir: $!";
mkdir "$tmpdir/md1/$_" or xbail "mkdir: $!";
@@ -77,8 +86,10 @@ test_lei({ tmpdir => $tmpdir }, sub {
is_deeply(json_utf8->decode($lei_out)->[0]->{'kw'},
['seen'], 'keyword set');
- lei_ok('index', "nntp://$nntp_host_port/t.v2");
- lei_ok('index', "imap://$imap_host_port/t.v2.0");
+ $srv->{nntpd} and
+ lei_ok('index', "nntp://$srv->{nntp_host_port}/t.v2");
+ $srv->{imapd} and
+ lei_ok('index', "imap://$srv->{imap_host_port}/t.v2.0");
is_deeply([xqx($all_obj)], \@objs, 'no new objects from NNTP+IMAP');
lei_ok qw(q m:multipart-html-sucks@11);
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] fixes for odd/old/missing dependencies
@ 2021-09-27 21:05 5% ` Eric Wong
2021-09-27 21:05 7% ` [PATCH 2/3] t/lei-index: IMAP and NNTP dependencies are optional Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-09-27 21:05 UTC (permalink / raw)
To: meta, Konstantin Ryabitsev
On Mon, 27 Sep 2021 15:45:20 -0400, Konstantin Ryabitsev wrote:
> On Mon, Sep 27, 2021 at 07:33:46PM +0000, Eric Wong wrote:
> > The partial fetching would need some work to support working as
> > root.
>
> Ah. Just catch this with check if if id=0 and skipping the test as "known not
> to work for this use-case."
It wasn't much to add support for root, actually. The rest of
the stuff should be fixed, too.
Eric Wong (3):
fetch: support running as root
t/lei-index: IMAP and NNTP dependencies are optional
lei completion: workaround old Perl bug
lib/PublicInbox/Fetch.pm | 15 ++++++++++--
lib/PublicInbox/LeiExportKw.pm | 2 +-
lib/PublicInbox/LeiImport.pm | 4 +--
lib/PublicInbox/LeiLsMailSource.pm | 4 +--
lib/PublicInbox/LeiRefreshMailSync.pm | 2 +-
t/lei-index.t | 35 ++++++++++++++++++---------
t/v2mirror.t | 13 +++++++---
7 files changed, 52 insertions(+), 23 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-09-27 19:45 -fetch failures [was: latest make test failures on CentOS-7] Konstantin Ryabitsev
2021-09-27 21:05 5% ` [PATCH 0/3] fixes for odd/old/missing dependencies Eric Wong
2021-09-27 21:05 7% ` [PATCH 2/3] t/lei-index: IMAP and NNTP dependencies are optional Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).