From 12149cdc4a21e03f0b8f6ee0a9e14e577c9eb942 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Tue, 3 Apr 2018 12:20:06 -0500
Subject: [PATCH] Re-enable imaptest on rawhide.

This still won't consistently build in koji; the test suite is just so
sensitive to timing for some reason.
---
 cyrus-imapd.spec | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index d191abc..34cceef 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -9,7 +9,7 @@
 
 Name: cyrus-imapd
 Version: 3.0.5
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %define ssl_pem_file /etc/pki/%name/%name.pem
 
@@ -471,20 +471,6 @@ tests=(
     # https://github.com/cyrusimap/cyrus-imapd/issues/2047
     Admin.imap_admins
 
-    # Disable ImapTest completely due to
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1562970
-    ImapTest
-
-    # Three new failures with imaptest 20170719
-    # https://github.com/cyrusimap/cyrus-imapd/issues/2087
-    #ImapTest.append-binary
-    #ImapTest.fetch-binary-mime
-    #ImapTest.urlauth-binary
-
-    # This one seems to fail randomly.  The new imaptest really isn't great and
-    # we should consider dropping it entirely.
-    #ImapTest.urlauth2
-
     # Not sure why this one is failing.
     Caldav.changes_remove
 
@@ -501,6 +487,21 @@ tests=(
 )
 for i in ${tests[@]}; do exclude+=("!$i"); done
 
+%if 0%{?fedra} <= 28
+# imaptest on F28 has bugs which make some additional tests fail
+tests=(
+    # Three new failures with imaptest 20170719
+    # https://github.com/cyrusimap/cyrus-imapd/issues/2087
+    ImapTest.append-binary
+    ImapTest.fetch-binary-mime
+    ImapTest.urlauth-binary
+
+    # This one seems to fail randomly.
+    ImapTest.urlauth2
+)
+for i in ${tests[@]}; do exclude+=("!$i"); done
+%endif
+
 %if 0%{?fedora} <= 26
 # Some F26-specific test exclusions
 tests=(
@@ -524,8 +525,7 @@ for i in ${tests[@]}; do exclude+=("!$i"); done
 %endif
 
 # Add -vvv for too much output
-#./testrunner.pl %%{?_smp_mflags} -v -f pretty ${exclude[@]} 2>&1
-./testrunner.pl -v -f pretty ${exclude[@]} 2>&1
+./testrunner.pl %{?_smp_mflags} -v -f pretty ${exclude[@]} 2>&1
 
 
 %pre
@@ -634,6 +634,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
+* Tue Apr 03 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-11
+- Re-enable imaptest on >= F29.
+- F29's imaptest fixes several bugs, allowing all tests to be run there.
+
 * Mon Apr 02 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-10
 - Update cassandane checkout to fix a test that was broken by DST.
 - Add patch to fix sieve scripts for usernames containing a dot.