No ext_urls

[public-inbox.git] / t / lei-watch.t

diff --git a/t/lei-watch.t b/t/lei-watch.t
index 492f6c1d7790e8e58d6ce6bd40905e609dbfb852..24d9f5c890dcbc6ee52fc5b1d726396b7f765bcd 100644 (file)
--- a/t/lei-watch.t
+++ b/t/lei-watch.t
@@ -2,7 +2,8 @@
 # Copyright all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict; use v5.10.1; use PublicInbox::TestCommon;
-use File::Path qw(make_path);
+use File::Path qw(make_path remove_tree);
+plan skip_all => "TEST_FLAKY not enabled for $0" if !$ENV{TEST_FLAKY};
 require_mods('lei');
 my $have_fast_inotify = eval { require Linux::Inotify2 } ||
        eval { require IO::KQueue };
@@ -25,7 +26,7 @@ test_lei(sub {
                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/
+                       (readlink($_) // '') =~ /\binotify\b/
                } glob("/proc/$pid/fd/*");
                is(scalar(@ino), 1, 'only one inotify FD');
                my $ino_fd = (split('/', $ino[0]))[-1];
@@ -52,13 +53,13 @@ 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.2 : 2.2); # 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";
        my @f2 = glob("$md2/*/*");
        is(scalar(@f2), 1, 'got one result');
-       like($f2[0], qr/S\z/, 'seen set from rename');
+       like($f2[0], qr/S\z/, 'seen set from rename') or diag explain(\@f2);
        my $e2 = eml_load($f2[0]);
        my $e1 = eml_load("$f[0]S");
        is_deeply($e2, $e1, 'results match');
@@ -71,9 +72,19 @@ test_lei(sub {
                        'inotify has Maildir watches');
        }
 
-       is(xsys(qw(git config -f), $cfg_f,
-                       '--remove-section', "watch.maildir:$md"),
-               0, 'unset config state');
+       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');
 
@@ -81,7 +92,7 @@ test_lei(sub {
                $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');
+               is_xdeeply($cmp, $ino_contents, 'inotify Maildir watches gone');
        };
 });