From: Eric Wong <e@80x24.org>
Date: Thu, 26 Sep 2024 10:56:35 +0000 (+0000)
Subject: t/lei-import-imap: bail on missing UIDVALIDITY after import
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e856a3a9fe437045d4bc984ade27c6e0aacfebad;p=thirdparty%2Fpublic-inbox.git

t/lei-import-imap: bail on missing UIDVALIDITY after import

I haven't been able to reproduce it, but I've seen the test
fail because ls-mail-sync didn't emit anything which matched
/;UIDVALIDITY=(\d+)\s*/.  Add some diagnostics and bail out
right away if it happens again.
---

diff --git a/t/lei-import-imap.t b/t/lei-import-imap.t
index 3b6cb2992..a835e82f3 100644
--- a/t/lei-import-imap.t
+++ b/t/lei-import-imap.t
@@ -39,9 +39,10 @@ test_lei({ tmpdir => $tmpdir }, sub {
 	lei_ok 'ls-mail-sync';
 	like($lei_out, qr!$re\n\z!, 'ls-mail-sync');
 	chomp(my $u = $lei_out);
-	lei_ok('import', $u, \'UIDVALIDITY match in URL');
 	$url = $u;
-	$u =~ s/;UIDVALIDITY=(\d+)\s*/;UIDVALIDITY=9$1/s;
+	$u =~ s/;UIDVALIDITY=(\d+)\s*/;UIDVALIDITY=9$1/s or
+		xbail 'no UIDVALIDITY=\\d+ in URL=', \$u, 'lei_out=', \$lei_out;
+	lei_ok('import', $url, \'UIDVALIDITY match in URL');
 	ok(!lei('import', $u), 'UIDVALIDITY mismatch in URL rejected');
 	like($lei_err, qr/UIDVALIDITY mismatch/, 'mismatch noted');