X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Flei-watch.t;h=a881fbb9c05ccb310cd09d657c9b3e210c9a17aa;hb=0c385e6500f26babc47a0768b730ea38e290a5f5;hp=3a2f9e64516fda179f82274e904ece03b8ff045e;hpb=5b4fde37adefa37508d131dbe013353ef3345051;p=public-inbox.git
diff --git a/t/lei-watch.t b/t/lei-watch.t
index 3a2f9e64..a881fbb9 100644
--- a/t/lei-watch.t
+++ b/t/lei-watch.t
@@ -2,7 +2,7 @@
# Copyright all contributors
# License: AGPL-3.0+
use strict; use v5.10.1; use PublicInbox::TestCommon;
-use File::Path qw(make_path);
+use File::Path qw(make_path remove_tree);
require_mods('lei');
my $have_fast_inotify = eval { require Linux::Inotify2 } ||
eval { require IO::KQueue };
@@ -13,9 +13,27 @@ $have_fast_inotify or
my ($ro_home, $cfg_path) = setup_public_inboxes;
test_lei(sub {
my $md = "$ENV{HOME}/md";
+ my $cfg_f = "$ENV{HOME}/.config/lei/config";
my $md2 = $md.'2';
lei_ok 'ls-watch';
is($lei_out, '', 'nothing in ls-watch, yet');
+
+ my ($ino_fdinfo, $ino_contents);
+ SKIP: {
+ $have_fast_inotify && $^O eq 'linux' or
+ skip 'Linux/inotify-only internals check', 1;
+ lei_ok 'daemon-pid'; chomp(my $pid = $lei_out);
+ skip 'missing /proc/$PID/fd', 1 if !-d "/proc/$pid/fd";
+ my @ino = grep {
+ (readlink($_) // '') =~ /\binotify\b/
+ } glob("/proc/$pid/fd/*");
+ is(scalar(@ino), 1, 'only one inotify FD');
+ my $ino_fd = (split('/', $ino[0]))[-1];
+ $ino_fdinfo = "/proc/$pid/fdinfo/$ino_fd";
+ open my $fh, '<', $ino_fdinfo or xbail "open $ino_fdinfo: $!";
+ $ino_contents = [ <$fh> ];
+ }
+
if (0) { # TODO
my $url = 'imaps://example.com/foo.bar.0';
lei_ok([qw(add-watch --state=pause), $url], undef, {});
@@ -34,7 +52,7 @@ test_lei(sub {
my @f = glob("$md/cur/*:2,");
is(scalar(@f), 1, 'got populated maildir with one result');
rename($f[0], "$f[0]S") or xbail "rename $!"; # set (S)een
- $have_fast_inotify or tick(2);
+ tick($have_fast_inotify ? 0.1 : 2.1); # always needed for 1 CPU systems
lei_ok qw(note-event done); # flushes immediately (instead of 5s)
lei_ok qw(q mid:testmessage@example.com -o), $md2, '-I', "$ro_home/t1";
@@ -44,6 +62,37 @@ test_lei(sub {
my $e2 = eml_load($f2[0]);
my $e1 = eml_load("$f[0]S");
is_deeply($e2, $e1, 'results match');
+
+ SKIP: {
+ $ino_fdinfo or skip 'Linux/inotify-only watch check', 1;
+ open my $fh, '<', $ino_fdinfo or xbail "open $ino_fdinfo: $!";
+ my $cmp = [ <$fh> ];
+ ok(scalar(@$cmp) > scalar(@$ino_contents),
+ 'inotify has Maildir watches');
+ }
+
+ lei_ok 'rm-watch', $md;
+ lei_ok 'ls-watch', \'refresh watches';
+ is($lei_out, '', 'no watches left');
+
+ lei_ok 'add-watch', $md2;
+ remove_tree($md2);
+ lei_ok 'rm-watch', "maildir:".$md2, \'with maildir: prefix';
+ lei_ok 'ls-watch', \'refresh watches';
+ is($lei_out, '', 'no watches left');
+
+ lei_ok 'add-watch', $md;
+ remove_tree($md);
+ lei_ok 'rm-watch', $md, \'absolute path w/ missing dir';
+ lei_ok 'ls-watch', \'refresh watches';
+ is($lei_out, '', 'no watches left');
+
+ SKIP: {
+ $ino_fdinfo or skip 'Linux/inotify-only removal removal', 1;
+ open my $fh, '<', $ino_fdinfo or xbail "open $ino_fdinfo: $!";
+ my $cmp = [ <$fh> ];
+ is_deeply($cmp, $ino_contents, 'inotify Maildir watches gone');
+ };
});
done_testing;