diff options
| author | Eric Wong <e@80x24.org> | 2021-03-31 03:29:47 +0500 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-03-31 00:33:53 +0000 |
| commit | a00b7214f767191580455b3895e6186c2a72febb (patch) | |
| tree | 67410b83bf088f95398a9b39ff46fb1996ce4cfb | |
| parent | 54da988cfb049ea2ffcc7abeaa3d026224656516 (diff) | |
| download | public-inbox-a00b7214f767191580455b3895e6186c2a72febb.tar.gz | |
We must use the $ops hashref returned by lei->workers_start,
since it's modified to include extra handlers for auth failures
and whatnot.
Fixes: 954581b8e575966a ("lei: simplify PktOp callers")
| -rw-r--r-- | lib/PublicInbox/LeiImport.pm | 2 | ||||
| -rw-r--r-- | lib/PublicInbox/LeiTag.pm | 2 | ||||
| -rw-r--r-- | xt/lei-auth-fail.t | 15 |
3 files changed, 9 insertions, 10 deletions
diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index 227a2a21..dbf655b6 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -76,7 +76,7 @@ sub lei_import { # the main "lei import" method my $ops = { '' => [ \&import_done, $lei ] }; $lei->{auth}->op_merge($ops, $self) if $lei->{auth}; $self->{-wq_nr_workers} = $j // 1; # locked - my ($op_c, undef) = $lei->workers_start($self, 'lei_import', $j, $ops); + (my $op_c, $ops) = $lei->workers_start($self, 'lei_import', $j, $ops); $lei->{imp} = $self; net_merge_complete($self) unless $lei->{auth}; $op_c->op_wait_event($ops); diff --git a/lib/PublicInbox/LeiTag.pm b/lib/PublicInbox/LeiTag.pm index 56ac25fa..8b012b16 100644 --- a/lib/PublicInbox/LeiTag.pm +++ b/lib/PublicInbox/LeiTag.pm @@ -116,7 +116,7 @@ sub lei_tag { # the "lei tag" method my $ops = { '' => [ \&tag_done, $lei ] }; $lei->{auth}->op_merge($ops, $self) if $lei->{auth}; $self->{vmd_mod} = $vmd_mod; - my ($op_c, undef) = $lei->workers_start($self, 'lei_tag', 1, $ops); + (my $op_c, $ops) = $lei->workers_start($self, 'lei_tag', 1, $ops); $lei->{tag} = $self; net_merge_complete($self) unless $lei->{auth}; $op_c->op_wait_event($ops); diff --git a/xt/lei-auth-fail.t b/xt/lei-auth-fail.t index 78f8466d..e352aab3 100644 --- a/xt/lei-auth-fail.t +++ b/xt/lei-auth-fail.t @@ -9,13 +9,12 @@ require_mods(qw(Mail::IMAPClient)); my $imap_fail = $ENV{TEST_LEI_IMAP_FAIL_URL} // 'imaps://AzureDiamond:Hunter2@public-inbox.org:994/INBOX'; test_lei(sub { - ok(!lei(qw(convert -o mboxrd:/dev/stdout), $imap_fail), - 'IMAP auth failure on convert'); - like($lei_err, qr!\bE:.*?imaps://.*?!sm, 'error shown'); - unlike($lei_err, qr!Hunter2!s, 'password not shown'); - is($lei_out, '', 'nothing output'); - ok(!lei(qw(import), $imap_fail), 'IMAP auth failure on import'); - like($lei_err, qr!\bE:.*?imaps://.*?!sm, 'error shown'); - unlike($lei_err, qr!Hunter2!s, 'password not shown'); + for my $pfx ([qw(convert -o mboxrd:/dev/stdout)], ['import'], + [qw(tag +L:INBOX)]) { + ok(!lei(@$pfx, $imap_fail), "IMAP auth failure on @$pfx"); + like($lei_err, qr!\bE:.*?imaps://.*?!sm, 'error shown'); + unlike($lei_err, qr!Hunter2!s, 'password not shown'); + is($lei_out, '', 'nothing output'); + } }); done_testing; |