X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimapd.t;h=43de867548c651ab89bb98bc51d8211e768cee28;hb=0ae89efce11e1e3b10a067c61c5b4cde30fa2b3b;hp=8cdb4e4aa12e85f04ff9268f6e8cee0eec0c00d5;hpb=29792d70a5d8305f68521664a7fa2e0fe54ff291;p=public-inbox.git

diff --git a/t/imapd.t b/t/imapd.t
index 8cdb4e4a..43de8675 100644
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -1,5 +1,5 @@
 #!perl -w
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # end-to-end IMAP tests, see unit tests in t/imap.t, too
 use strict;
@@ -7,7 +7,6 @@ use Test::More;
 use Time::HiRes ();
 use PublicInbox::TestCommon;
 use PublicInbox::Config;
-use PublicInbox::Spawn qw(which);
 require_mods(qw(-imapd Mail::IMAPClient));
 my $imap_client = 'Mail::IMAPClient';
 my $can_compress = $imap_client->can('compress');
@@ -39,7 +38,8 @@ print $cfgfh <<EOM or BAIL_OUT;
 EOM
 my $eml;
 for my $V (@V) {
-	my $ibx = create_inbox("i$V", tmpdir => "$tmpdir/i$V", version => $V,
+	my $ibx = create_inbox("i$V-$level",
+				tmpdir => "$tmpdir/i$V", version => $V,
 				indexlevel => $level, sub {
 		my ($im) = @_;
 		$im->add($eml //= eml_load('t/utf8.eml')) or BAIL_OUT;
@@ -52,6 +52,7 @@ for my $V (@V) {
 	address = $ibx->{-primary_address};
 	newsgroup = inbox.i$V
 	url = http://example.com/i$V
+	indexlevel = $level
 EOF
 }
 close $cfgfh or BAIL_OUT;
@@ -98,7 +99,8 @@ ok($mic->examine($mailbox1), 'EXAMINE succeeds');
 my @raw = $mic->status($mailbox1, qw(Messages uidnext uidvalidity));
 is(scalar(@raw), 2, 'got status response');
 like($raw[0], qr/\A\*\x20STATUS\x20inbox\.i1\.$first_range\x20
-	\(MESSAGES\x20\d+\x20UIDNEXT\x20\d+\x20UIDVALIDITY\x20\d+\)\r\n/sx);
+	\(MESSAGES\x20[1-9][0-9]*\x20
+	UIDNEXT\x20\d+\x20UIDVALIDITY\x20\d+\)\r\n/sx);
 like($raw[1], qr/\A\S+ OK /, 'finished status response');
 
 my @orig_list = @raw = $mic->list;
@@ -444,7 +446,7 @@ SKIP: {
 	mkdir "$home/.public-inbox" or BAIL_OUT $!;
 	local $ENV{HOME} = $home;
 	my $name = 'watchimap';
-	my $addr = "i1\@example.com";
+	my $addr = "i1-$level\@example.com";
 	my $url = "http://example.com/i1";
 	my $inboxdir = "$tmpdir/watchimap";
 	my $cmd = ['-init', '-V2', '-Lbasic', $name, $inboxdir, $url, $addr];
@@ -465,17 +467,18 @@ SKIP: {
 	my $w = start_script(['-watch'], undef, { 2 => $err_wr });
 
 	diag 'waiting for initial fetch...';
-	PublicInbox::DS->EventLoop;
+	PublicInbox::DS::event_loop();
 	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');
+		'delivered a message for IDLE to kick -watch') or
+		diag "mda error \$?=$?";
 	diag 'waiting for IMAP IDLE wakeup';
 	PublicInbox::DS->SetPostLoopCallback(undef);
-	PublicInbox::DS->EventLoop;
+	PublicInbox::DS::event_loop();
 	diag 'inbox unlocked on IDLE wakeup';
 
 	# try again with polling
@@ -492,7 +495,7 @@ SKIP: {
 
 	diag 'waiting for PollInterval wakeup';
 	PublicInbox::DS->SetPostLoopCallback(undef);
-	PublicInbox::DS->EventLoop;
+	PublicInbox::DS::event_loop();
 	diag 'inbox unlocked (poll)';
 	$w->kill;
 	$w->join;