unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
* [PATCH 0/2] test reliability fixes
@ 2021-09-02 22:36 Eric Wong
  2021-09-02 22:36 ` [PATCH 1/2] t/lei-auto-watch: improve test reliability Eric Wong
  2021-09-02 22:36 ` [PATCH 2/2] tests: "make check-run" favors reliability over speed Eric Wong
  0 siblings, 2 replies; 3+ messages in thread
From: Eric Wong @ 2021-09-02 22:36 UTC (permalink / raw)
  To: meta

Eric Wong (2):
  t/lei-auto-watch: improve test reliability
  tests: "make check-run" favors reliability over speed

 t/lei-auto-watch.t | 13 ++++++++-----
 t/run.perl         |  9 +++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 1/2] t/lei-auto-watch: improve test reliability
  2021-09-02 22:36 [PATCH 0/2] test reliability fixes Eric Wong
@ 2021-09-02 22:36 ` Eric Wong
  2021-09-02 22:36 ` [PATCH 2/2] tests: "make check-run" favors reliability over speed Eric Wong
  1 sibling, 0 replies; 3+ messages in thread
From: Eric Wong @ 2021-09-02 22:36 UTC (permalink / raw)
  To: meta

On slower systems, even a 100ms delay may not be enough;
so loop and retry in hopes of an early exit for faster
systems.
---
 t/lei-auto-watch.t | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/t/lei-auto-watch.t b/t/lei-auto-watch.t
index 146402a6..3b0c1b10 100644
--- a/t/lei-auto-watch.t
+++ b/t/lei-auto-watch.t
@@ -4,9 +4,8 @@
 use strict; use v5.10.1; use PublicInbox::TestCommon;
 use File::Basename qw(basename);
 my ($ro_home, $cfg_path) = setup_public_inboxes;
-my $tick = 2.1;
-my $have_fast_inotify = eval { require Linux::Inotify2; $tick = 0.1 } ||
-	eval { require IO::KQueue; $tick = 0.5 };
+my $have_fast_inotify = eval { require Linux::Inotify2 } ||
+	eval { require IO::KQueue };
 
 $have_fast_inotify or
 	diag("$0 IO::KQueue or Linux::Inotify2 missing, test will be slow");
@@ -31,9 +30,13 @@ test_lei(sub {
 	lei_ok qw(add-watch), $x;
 	my $dst = $x[0] . 'S';
 	rename($x[0], $dst) or xbail "rename($x[0], $dst): $!";
-	tick($tick); # wait for inotify or kevent
+	my $ys = "$y[0]S";
+	for (0..50) {
+		last if -f $ys;
+		tick; # wait for inotify or kevent
+	}
 	my @y2 = glob("$y/*/*");
-	is_deeply(\@y2, [ "$y[0]S" ], "`seen' kw propagated to `y' dir");
+	is_deeply(\@y2, [ $ys ], "`seen' kw propagated to `y' dir");
 	lei_ok qw(note-event done);
 	lei_ok qw(inspect), "blob:$oid";
 	$ins = json_utf8->decode($lei_out);

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 2/2] tests: "make check-run" favors reliability over speed
  2021-09-02 22:36 [PATCH 0/2] test reliability fixes Eric Wong
  2021-09-02 22:36 ` [PATCH 1/2] t/lei-auto-watch: improve test reliability Eric Wong
@ 2021-09-02 22:36 ` Eric Wong
  1 sibling, 0 replies; 3+ messages in thread
From: Eric Wong @ 2021-09-02 22:36 UTC (permalink / raw)
  To: meta

Sharing a single lei-daemon across multiple processes still
exhibits reliability problems, and reliably checking
lei-daemon's inotify internals seems impossible without.

Even without lei-daemon sharing, "make check-run" is a few
seconds faster than "make check" for me.
---
 t/run.perl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/t/run.perl b/t/run.perl
index f6eb0ad3..5082125b 100755
--- a/t/run.perl
+++ b/t/run.perl
@@ -53,10 +53,11 @@ key2sub($_) for @tests; # precache
 
 my ($for_destroy, $lei_env, $lei_daemon_pid, $owner_pid);
 
-# I get ECONNRESET from lei on FreeBSD 11.3 even with
-# kern.ipc.soacceptqueue=1073741823, so persistent lei-daemon in tests
-# is Linux-only for now:
-if ($^O eq 'linux' && !$ENV{TEST_LEI_DAEMON_PERSIST_DIR} &&
+# TEST_LEI_DAEMON_PERSIST is currently broken.  I get ECONNRESET from
+# lei even with high kern.ipc.soacceptqueue=1073741823 or SOMAXCONN, not
+# sure why.  Also, testing our internal inotify usage is unreliable
+# because lei-daemon uses a single inotify FD for all clients.
+if ($ENV{TEST_LEI_DAEMON_PERSIST} && !$ENV{TEST_LEI_DAEMON_PERSIST_DIR} &&
 		(PublicInbox::Spawn->can('recv_cmd4') ||
 			eval { require Socket::MsgHdr })) {
 	$lei_env = {};

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-09-02 22:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-02 22:36 [PATCH 0/2] test reliability fixes Eric Wong
2021-09-02 22:36 ` [PATCH 1/2] t/lei-auto-watch: improve test reliability Eric Wong
2021-09-02 22:36 ` [PATCH 2/2] tests: "make check-run" favors reliability over speed Eric Wong

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 NNTP newsgroup(s).