* [PATCH 2/3] imaptracker: update_last: simplify callers
2020-08-28 10:12 [PATCH 0/3] more watch-related stuff Eric Wong
2020-08-28 10:12 ` [PATCH 1/3] watch: flush changes to inbox before updating IMAPTracker Eric Wong
@ 2020-08-28 10:12 ` Eric Wong
2020-08-28 10:13 ` [PATCH 3/3] tests: check-run: show skipped tests Eric Wong
2 siblings, 0 replies; 5+ messages in thread
From: Eric Wong @ 2020-08-28 10:12 UTC (permalink / raw)
To: meta
By making it a no-op if last_uid is not defined. This isn't a
hot code path, so the extra method dispatch isn't an issue.
It'll save some indentation/wrapping in future commits.
---
lib/PublicInbox/IMAPTracker.pm | 5 +++--
lib/PublicInbox/WatchMaildir.pm | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/IMAPTracker.pm b/lib/PublicInbox/IMAPTracker.pm
index 92f21584..be9caf76 100644
--- a/lib/PublicInbox/IMAPTracker.pm
+++ b/lib/PublicInbox/IMAPTracker.pm
@@ -49,13 +49,14 @@ SELECT uid_validity, uid FROM imap_last WHERE url = ?
}
sub update_last ($$$) {
- my ($self, $validity, $last) = @_;
+ my ($self, $validity, $last_uid) = @_;
+ return unless defined $last_uid;
my $sth = $self->{dbh}->prepare_cached(<<'');
INSERT OR REPLACE INTO imap_last (url, uid_validity, uid)
VALUES (?, ?, ?)
$self->lock_acquire;
- my $rv = $sth->execute($self->{url}, $validity, $last);
+ my $rv = $sth->execute($self->{url}, $validity, $last_uid);
$self->lock_release;
$rv;
}
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 78aec8a2..a227a6fd 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -494,7 +494,7 @@ sub imap_fetch_all ($$$) {
last if $self->{quit};
}
_done_for_now($self);
- $itrk->update_last($r_uidval, $last_uid) if defined $last_uid;
+ $itrk->update_last($r_uidval, $last_uid);
} until ($err || $self->{quit});
$err;
}
@@ -919,7 +919,7 @@ sub nntp_fetch_all ($$$) {
$last_art = $art;
}
_done_for_now($self);
- $itrk->update_last(0, $last_art) if defined $last_art;
+ $itrk->update_last(0, $last_art);
$err;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] tests: check-run: show skipped tests
2020-08-28 10:12 [PATCH 0/3] more watch-related stuff Eric Wong
2020-08-28 10:12 ` [PATCH 1/3] watch: flush changes to inbox before updating IMAPTracker Eric Wong
2020-08-28 10:12 ` [PATCH 2/3] imaptracker: update_last: simplify callers Eric Wong
@ 2020-08-28 10:13 ` Eric Wong
2020-08-28 22:18 ` Eric Wong
2 siblings, 1 reply; 5+ messages in thread
From: Eric Wong @ 2020-08-28 10:13 UTC (permalink / raw)
To: meta
We'll deduplicate redundant lines and show counts of skipped
tests to ensure it's easy to notice if something is unexpectedly
skipped.
---
t/run.perl | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/t/run.perl b/t/run.perl
index b1a0d2fe..e3e3e075 100755
--- a/t/run.perl
+++ b/t/run.perl
@@ -15,6 +15,7 @@ use PublicInbox::TestCommon;
use Cwd qw(getcwd);
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
use Errno qw(EINTR);
+use Fcntl qw(:seek);
use POSIX qw(_POSIX_PIPE_BUF WNOHANG);
my $jobs = 1;
my $repeat = 1;
@@ -65,14 +66,31 @@ sub test_status () {
if ($log_suffix ne '') {
my $log = $worker_test;
$log =~ s/\.t\z/$log_suffix/;
+ my $skip = '';
if (open my $fh, '<', $log) {
my @not_ok = grep(!/^(?:ok |[ \t]*#)/ms, <$fh>);
pop @not_ok if $not_ok[-1] =~ /^[0-9]+\.\.[0-9]+$/;
- print OLDERR map { "# $log: $_" } @not_ok;
+ my $pfx = "# $log: ";
+ print OLDERR map { $pfx.$_ } @not_ok;
+ seek($fh, 0, SEEK_SET) or die "seek: $!";
+
+ # show unique skip texts and the number of times
+ # each text was skipped
+ local $/;
+ my @sk = (<$fh> =~ m/^ok [0-9]+ (# skip [^\n]+)/mgs);
+ if (@sk) {
+ my %nr;
+ $nr{$_}++ for @sk;
+ for (@sk) {
+ my $n = delete $nr{$_} or next;
+ print OLDERR "$pfx$_ ($n)\n";
+ }
+ $skip = ' # total skipped: '.scalar(@sk);
+ }
} else {
print OLDERR "could not open: $log: $!\n";
}
- print OLDOUT "$status $worker_test\n";
+ print OLDOUT "$status $worker_test$skip\n";
}
}
^ permalink raw reply related [flat|nested] 5+ messages in thread