X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimapd.t;h=a464ad86058d374953a9c3bc943599fd2fa49bde;hb=933fce93167eba8645e637c363561575db9f9420;hp=ffa195d57ac61c5d984390440628e76463e8ef07;hpb=7d626338a6bf02c1098ba16302f5c13be0370673;p=public-inbox.git

diff --git a/t/imapd.t b/t/imapd.t
index ffa195d5..a464ad86 100644
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -39,11 +39,9 @@ for my $V (@V) {
 	my $url = "http://example.com/i$V";
 	my $inboxdir = "$tmpdir/$name";
 	my $folder = "inbox.i$V";
-	my $cmd = ['-init', "-V$V", "-L$level", $name, $inboxdir, $url, $addr];
+	my $cmd = ['-init', "-V$V", "-L$level", "--ng=$folder",
+		$name, $inboxdir, $url, $addr];
 	run_script($cmd) or BAIL_OUT("init $name");
-	xsys(qw(git config), "--file=$ENV{HOME}/.public-inbox/config",
-			"publicinbox.$name.newsgroup", $folder) == 0 or
-			BAIL_OUT("setting newsgroup $V");
 	if ($V == 1) {
 		xsys(qw(git config), "--file=$ENV{HOME}/.public-inbox/config",
 			'publicinboxmda.spamcheck', 'none') == 0 or
@@ -87,12 +85,16 @@ my $post_auth_anon_capa = $mic->capability;
 is_deeply($post_auth_anon_capa, $post_login_capa,
 	'auth anon has same capabilities');
 my $e;
+ok($mic->noop, 'NOOP');
+ok($mic->noop, 'NOOP (again)'); # for warnings
 ok(!$mic->examine('foo') && ($e = $@), 'EXAMINE non-existent');
 like($e, qr/\bNO\b/, 'got a NO on EXAMINE for non-existent');
 ok(!$mic->select('foo') && ($e = $@), 'EXAMINE non-existent');
 like($e, qr/\bNO\b/, 'got a NO on EXAMINE for non-existent');
 my $mailbox1 = "inbox.i1.$first_range";
 ok($mic->select('inbox.i1'), 'SELECT on parent succeeds');
+ok($mic->noop, 'NOOP while selected');
+ok($mic->noop, 'NOOP again while selected'); # check warnings later
 ok($mic->select($mailbox1), 'SELECT succeeds');
 ok($mic->examine($mailbox1), 'EXAMINE succeeds');
 my @raw = $mic->status($mailbox1, qw(Messages uidnext uidvalidity));
@@ -120,9 +122,11 @@ $ret = $mic->search('uid 1:1') or BAIL_OUT "SEARCH FAIL $@";
 is_deeply($ret, [ 1 ], 'search UID 1:1 works');
 $ret = $mic->search('uid 1:*') or BAIL_OUT "SEARCH FAIL $@";
 is_deeply($ret, [ 1 ], 'search UID 1:* works');
+$ret = $mic->search('DELETED') or BAIL_OUT "SEARCH FAIL $@";
+is_deeply($ret, [], 'searching for DELETED returns nothing');
 
 SKIP: {
-	skip 'Xapian missing', 7 if $level eq 'basic';
+	skip 'Xapian missing', 8 if $level eq 'basic';
 	my $x = $mic->search(qw(smaller 99999));
 	is_deeply($x, [1], 'SMALLER works with Xapian (hit)');
 	$x = $mic->search(qw(smaller 9));
@@ -135,6 +139,10 @@ SKIP: {
 
 	$x = $mic->search(qw(HEADER Message-ID testmessage@example.com));
 	is_deeply($x, [1], 'HEADER Message-ID works');
+
+	$x = $mic->search(qw(DRAFT HEADER Message-ID testmessage@example.com));
+	is_deeply($x, [], 'impossible (DRAFT) key filters out match');
+
 	$x = $mic->search(qw(HEADER Message-ID miss));
 	is_deeply($x, [], 'HEADER Message-ID can miss');
 
@@ -288,27 +296,11 @@ $pi_config->each_inbox(sub {
 
 	# ensure IDLE persists across HUP, w/o extra watches or FDs
 	$td->kill('HUP') or BAIL_OUT "failed to kill -imapd: $!";
-	SKIP: {
-		skip 'no inotify fdinfo (or support)', 2 if !@ino_info;
-		my (@tmp, %prev);
-		local $/ = "\n";
-		my $end = time + 5;
-		until (time > $end) {
-			select undef, undef, undef, 0.01;
-			open my $fh, '<', $ino_fdinfo or
-						BAIL_OUT "$ino_fdinfo: $!";
-			%prev = map { $_ => 1 } @ino_info;
-			@tmp = grep(/^inotify wd:/, <$fh>);
-			if (scalar(@tmp) == scalar(@ino_info)) {
-				delete @prev{@tmp};
-				last if scalar(keys(%prev)) == @ino_info;
-			}
-		}
-		is(scalar @tmp, scalar @ino_info,
-			'old inotify watches replaced');
-		is(scalar keys %prev, scalar @ino_info,
-			'no previous watches overlap');
-	};
+	for my $n (1..2) { # kick the event loop so we know HUP is done
+		my $m = $imap_client->new(%mic_opt);
+		ok($m->login && $m->IsAuthenticated && $m->logout,
+			"connection $n works after HUP");
+	}
 
 	open($fh, '<', 't/data/0001.patch') or BAIL_OUT("open: $!");
 	run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or
@@ -363,6 +355,10 @@ EOF
 	@hits = $mic->search('SENTSINCE' => '18-Apr-2020');
 	is_deeply(\@hits, [], 'search on dummy with condition works');
 	ok(!$mic->search('SENTSINCE' => '18-Abr-2020'), 'bad month fails');
+	$mic->Uid(0);
+	my $ret = $mic->fetch_hash(2, 'RFC822');
+	is_deeply($ret, {},
+		'MSN FETCH on empty dummy will not trigger warnings, later');
 }); # each_inbox
 
 # message sequence numbers :<
@@ -396,8 +392,11 @@ SKIP: {
 	skip 'Xapian missing', 3 if $level eq 'basic';
 	my $x = $mic->search(qw(header subject embedded));
 	is(scalar(@$x), 1, 'MSN SEARCH on Subject works after rm');
-	$x = $mic->message_string($x->[0]);
-	is($x, $ret->{2}->{RFC822}, 'message 2 unchanged');
+	SKIP: {
+		skip 'previous test failed', 1 if !scalar(@$x);
+		$x = $mic->message_string($x->[0]);
+		is($x, $ret->{2}->{RFC822}, 'message 2 unchanged');
+	}
 	$x = $mic->search(qw(text embedded));
 	is(scalar(@$x), 1, 'MSN SEARCH on TEXT works after rm');
 }
@@ -440,9 +439,108 @@ ok($mic->logout, 'logged out');
 	like(<$c>, qr/\Atagonly BAD Error in IMAP command/, 'tag-only line');
 }
 
+SKIP: {
+	use_ok 'PublicInbox::Watch';
+	use_ok 'PublicInbox::InboxIdle';
+	require_git('1.8.5', 1) or
+		skip('git 1.8.5+ needed for --urlmatch', 4);
+	my $old_env = { HOME => $ENV{HOME} };
+	my $home = "$tmpdir/watch_home";
+	mkdir $home or BAIL_OUT $!;
+	mkdir "$home/.public-inbox" or BAIL_OUT $!;
+	local $ENV{HOME} = $home;
+	my $name = 'watchimap';
+	my $addr = "i1\@example.com";
+	my $url = "http://example.com/i1";
+	my $inboxdir = "$tmpdir/watchimap";
+	my $cmd = ['-init', '-V2', '-Lbasic', $name, $inboxdir, $url, $addr];
+	my ($ihost, $iport) = ($sock->sockhost, $sock->sockport);
+	my $imapurl = "imap://$ihost:$iport/inbox.i1.0";
+	run_script($cmd) or BAIL_OUT("init $name");
+	xsys(qw(git config), "--file=$home/.public-inbox/config",
+			"publicinbox.$name.watch",
+			$imapurl) == 0 or BAIL_OUT "git config $?";
+	my $cfg = PublicInbox::Config->new;
+	PublicInbox::DS->Reset;
+	my $ii = PublicInbox::InboxIdle->new($cfg);
+	my $cb = sub { PublicInbox::DS->SetPostLoopCallback(sub {}) };
+	my $obj = bless \$cb, 'PublicInbox::TestCommon::InboxWakeup';
+	$cfg->each_inbox(sub { $_[0]->subscribe_unlock('ident', $obj) });
+	my $watcherr = "$tmpdir/watcherr";
+	open my $err_wr, '>>', $watcherr or BAIL_OUT $!;
+	open my $err, '<', $watcherr or BAIL_OUT $!;
+	my $w = start_script(['-watch'], undef, { 2 => $err_wr });
+
+	diag 'waiting for initial fetch...';
+	PublicInbox::DS->EventLoop;
+	diag 'inbox unlocked on initial fetch, waiting for IDLE';
+
+	tick until (grep(/I: \S+ idling/, <$err>));
+	open my $fh, '<', 't/iso-2202-jp.eml' or BAIL_OUT $!;
+	$old_env->{ORIGINAL_RECIPIENT} = $addr;
+	ok(run_script([qw(-mda --no-precheck)], $old_env, { 0 => $fh }),
+		'delivered a message for IDLE to kick -watch');
+	diag 'waiting for IMAP IDLE wakeup';
+	PublicInbox::DS->SetPostLoopCallback(undef);
+	PublicInbox::DS->EventLoop;
+	diag 'inbox unlocked on IDLE wakeup';
+
+	# try again with polling
+	xsys(qw(git config), "--file=$home/.public-inbox/config",
+		'imap.PollInterval', 0.11) == 0
+		or BAIL_OUT "git config $?";
+	$w->kill('HUP');
+	diag 'waiting for -watch reload + initial fetch';
+	tick until (grep(/I: will check/, <$err>));
+
+	open $fh, '<', 't/psgi_attach.eml' or BAIL_OUT $!;
+	ok(run_script([qw(-mda --no-precheck)], $old_env, { 0 => $fh }),
+		'delivered a message for -watch PollInterval');
+
+	diag 'waiting for PollInterval wakeup';
+	PublicInbox::DS->SetPostLoopCallback(undef);
+	PublicInbox::DS->EventLoop;
+	diag 'inbox unlocked (poll)';
+	$w->kill;
+	$w->join;
+	is($?, 0, 'no error in exited -watch process');
+
+	$cfg->each_inbox(sub { shift->unsubscribe_unlock('ident') });
+	$ii->close;
+	PublicInbox::DS->Reset;
+	seek($err, 0, 0);
+	my @err = grep(!/^I:/, <$err>);
+	is(@err, 0, 'no warnings/errors from -watch'.join(' ', @err));
+
+	if ($ENV{TEST_KILL_IMAPD}) { # not sure how reliable this test can be
+		xsys(qw(git config), "--file=$home/.public-inbox/config",
+			qw(--unset imap.PollInterval)) == 0
+			or BAIL_OUT "git config $?";
+		truncate($err_wr, 0) or BAIL_OUT $!;
+		my @t0 = times;
+		$w = start_script(['-watch'], undef, { 2 => $err_wr });
+		seek($err, 0, 0);
+		tick until (grep(/I: \S+ idling/, <$err>));
+		diag 'killing imapd, waiting for CPU spins';
+		my $delay = 0.11;
+		$td->kill(9);
+		tick $delay;
+		$w->kill;
+		$w->join;
+		is($?, 0, 'no error in exited -watch process');
+		my @t1 = times;
+		my $c = $t1[2] + $t1[3] - $t0[2] - $t0[3];
+		my $thresh = (0.9 * $delay);
+		diag "c=$c, threshold=$thresh";
+		ok($c < $thresh, 'did not burn much CPU');
+		is_deeply([grep(/ line \d+$/m, <$err>)], [],
+				'no backtraces from errors');
+	}
+}
+
 $td->kill;
 $td->join;
-is($?, 0, 'no error in exited process');
+is($?, 0, 'no error in exited process') if !$ENV{TEST_KILL_IMAPD};
 open my $fh, '<', $err or BAIL_OUT("open $err failed: $!");
 my $eout = do { local $/; <$fh> };
 unlike($eout, qr/wide/i, 'no Wide character warnings');