diff options
| author | Eric Wong <e@80x24.org> | 2021-04-19 08:52:15 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-04-19 20:16:00 +0000 |
| commit | 48a3de066689174f65d5e12ebaff8f03f97942fb (patch) | |
| tree | d9c4b22420bf97ca918ef87ed467924e32d45de2 | |
| parent | f9d6b4a0f5f66a084682aba229b44ef47afdfc35 (diff) | |
| download | public-inbox-48a3de066689174f65d5e12ebaff8f03f97942fb.tar.gz | |
This necessitated fixing pause_dedupe to release the handle used by ->lock_for_scope_fast, but otherwise no changes to the LeiToMail package.
| -rw-r--r-- | lib/PublicInbox/LeiSavedSearch.pm | 1 | ||||
| -rw-r--r-- | t/lei-q-save.t | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/PublicInbox/LeiSavedSearch.pm b/lib/PublicInbox/LeiSavedSearch.pm index 948e4954..cd9effce 100644 --- a/lib/PublicInbox/LeiSavedSearch.pm +++ b/lib/PublicInbox/LeiSavedSearch.pm @@ -182,6 +182,7 @@ sub git { $_[0]->{ale}->git } sub pause_dedupe { my ($self) = @_; $self->{ale}->git->cleanup; + my $lockfh = delete $self->{lockfh}; # from lock_for_scope_fast; my $oidx = delete($self->{oidx}) // return; $oidx->commit_lazy; } diff --git a/t/lei-q-save.t b/t/lei-q-save.t index 5bc8fb74..c0c74581 100644 --- a/t/lei-q-save.t +++ b/t/lei-q-save.t @@ -84,6 +84,7 @@ test_lei(sub { lei_ok([qw(up mbcl2)], undef, { -C => $home, %$lei_opt }); ok(-f "$home/mbcl2" && -s _ == 0, 'up recreates on missing output'); + # no --augment open my $mb, '>', "$home/mbrd" or xbail "open $!"; print $mb $pre_existing; close $mb or xbail "close: $!"; @@ -92,8 +93,20 @@ test_lei(sub { open $mb, '<', "$home/mbrd" or xbail "open $!"; is_deeply([grep(/pre-existing/, <$mb>)], [], 'pre-existing messsage gone w/o augment'); + close $mb; lei_ok(qw(q m:import-before@example.com)); is(json_utf8->decode($lei_out)->[0]->{'s'}, 'pre-existing', '--save imported before clobbering'); + + # --augment + open $mb, '>', "$home/mbrd-aug" or xbail "open $!"; + print $mb $pre_existing; + close $mb or xbail "close: $!"; + lei_ok(qw(q -a --save -o mboxrd:mbrd-aug m:qp@example.com -C), $home); + chdir($dh) or xbail "fchdir . $!"; + open $mb, '<', "$home/mbrd-aug" or xbail "open $!"; + $mb = do { local $/; <$mb> }; + like($mb, qr/pre-existing/, 'pre-existing message preserved w/ -a'); + like($mb, qr/<qp\@example\.com>/, 'new result written w/ -a'); }); done_testing; |