t/nntpd-tls: change diag() to like() assertion

[public-inbox.git] / t / imapd.t

diff --git a/t/imapd.t b/t/imapd.t
index 906b69266e888d4387bcea74c96e2adb562bc97a..80757a9d4071610ccb66ce924a2690de07055a33 100644 (file)
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -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');
@@ -467,7 +466,7 @@ 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>));
@@ -478,7 +477,7 @@ SKIP: {
                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
@@ -495,7 +494,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;