Update and adjust to the new Cassandane snapshot.

.gitignore

@@ -12,3 +12,4 @@
 /cassandane-6bd697c.tar.gz
 /cassandane-7cc17a1.tar.gz
 /cassandane-2b355ec.tar.gz
+/cassandane-50a1ec2.tar.gz

cassandane.ini

@@ -10,6 +10,7 @@ rootdir = CASSDIR/work
 pwcheck = alwaystrue # This is enabled in Fedora builds
 cleanup = no
 maxworkers = 1
+base_port = 19100
 
 #[valgrind]
 #enabled = no

cyrus-imapd.spec

@@ -1,15 +1,15 @@
 %define scmt(l:) %(c=%1; echo ${c:0:%{-l:%{-l*}}%{!-l:7}})
 
 # Cassandane commit hash.  Cassandane doesn't have releases often, but it
-# receives constant development.  This was fetched on 20180330.
-%global cocas 2b355ec031b4fce0ea5105dd7ecabb2bbffbeff5
+# receives constant development.  This was fetched on 20180411.
+%global cocas 50a1ec2cb57b68762c54b7cc3812f9353367af04
 
 # Cassandane run by default.  '--without cassandane' disables.
 %bcond_without cassandane
 
 Name: cyrus-imapd
 Version: 3.0.5
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 %define ssl_pem_file /etc/pki/%name/%name.pem
 
@@ -94,8 +94,9 @@ Source91: patch-cassandane-no-syslog
 # Upstream ticket https://github.com/cyrusimap/cyrus-imapd/issues/1995
 Source92: patch-cassandane-fix-annotator
 
-# Change the cassandane base port to avoid issues in koji
-Source93: patch-cassandane-base-port
+# Add some extra logging, from
+# https://github.com/cyrusimap/cassandane/issues/50
+Source93: patch-cassandane-extra-logging
 
 BuildRequires: autoconf automake bison flex gcc gcc-c++ git groff libtool
 BuildRequires: pkgconfig systemd transfig
@@ -475,19 +476,17 @@ tests=(
     # https://github.com/cyrusimap/cyrus-imapd/issues/2047
     Admin.imap_admins
 
-    # Not sure why this one is failing.
-    Caldav.changes_remove
-
     # Upstream on IRC indicates that all of these are expected to fail on 3.0.
-    CaldavAlarm.override_multiuser
-    Annotator.annotator_callout_disabled
-    CaldavAlarm.simple_multiuser_sametime
-    CaldavAlarm.simple_multiuser
     Carddav.sharing_contactpaths
-    Info.info_lint_junk
-    Info.info_lint
     Metadata.set_specialuse_twice
     SearchFuzzy.search_subjectsnippet
+
+    # These are newly (20180411) added tests which don't seem to work against
+    # the 3.0.5 codebase.  https://github.com/cyrusimap/cassandane/issues/54
+    Sieve.duplicate
+    Sieve.editheader
+    Sieve.ereject
+    Sieve.rfc5490_mailboxexists_variables
 )
 for i in ${tests[@]}; do exclude+=("!$i"); done
 
@@ -638,6 +637,14 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
+* Fri Apr 06 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-12
+- Update list of excluded tests.
+- Update Cassandane snapshot; use new base_port config setting.  No need to
+  patch that in now.
+- Add four new expected-to-fail tests from new Cassandane snapshot.
+- Add patch to collect extra Cassandane logging in case we hit some of those
+  sporadic failures again.
+
 * 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.

patch-cassandane-extra-logging

@@ -0,0 +1,20 @@
+diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
+index 6c6daf7..91f1ca2 100644
+--- a/Cassandane/Instance.pm
++++ b/Cassandane/Instance.pm
+@@ -274,6 +274,7 @@ sub _make_unique_instance_info
+	die "Invalid TEST_UNIT_WORKER_ID - code not run in Worker context"
+		if (defined($workerid) && $workerid eq 'invalid');
+	$stamp .= chr(64 + $workerid) if defined $workerid;
++       xlog "workerid: $workerid, stamp: $stamp"
+     }
+ 
+     my $rootdir = _rootdir();
+@@ -285,6 +286,7 @@ sub _make_unique_instance_info
+	$name = $stamp . $next_unique;
+	$next_unique++;
+	$basedir = "$rootdir/$name";
++       xlog "name: $name, basedir: $basedir";
+	last if mkdir($basedir);
+	die "Cannot create $basedir: $!" if ($! != EEXIST);
+     }

sources

@@ -1,3 +1,3 @@
 SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
 SHA512 (cyrus-imapd-3.0.5.tar.gz) = 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
-SHA512 (cassandane-2b355ec.tar.gz) = 321ef17699c9ba1f9d5f0a3241969bff0deb58402119542e0366b09ea0d2bd6a2eb3e617b3f0e73438947f31077901f16234bc2e92cb7faa82f53a536392d8c0
+SHA512 (cassandane-50a1ec2.tar.gz) = 9ede10c05ef59c520203182ec4278c2e52008d06606225272db91c587205bcbb500fd8f8ebe77d5d4d29693971400e950b79d4cf4ffac829272d9eeb8c3d8853