rpms/cyrus-imapd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update Cassandane again, fixing some random failures.

Browse Source
This commit is contained in:
Jason Tibbitts 2018-04-13 18:33:17 -05:00
parent 90e7b380c1
commit 665fc283a5
6 changed files with 13 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -13,3 +13,4 @@
/cassandane-7cc17a1.tar.gz
/cassandane-2b355ec.tar.gz
/cassandane-50a1ec2.tar.gz
/cassandane-389601b.tar.gz

25
cyrus-imapd.spec
View File

@ -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 20180411.
%global cocas 50a1ec2cb57b68762c54b7cc3812f9353367af04
# receives constant development. This was fetched on 20180413.
%global cocas 389601b810a4e862ba68d73f46dfae95810caf6e
# Cassandane run by default. '--without cassandane' disables.
%bcond_without cassandane
Name: cyrus-imapd
Version: 3.0.5
Release: 12%{?dist}
Release: 13%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@ -94,10 +94,6 @@ Source91: patch-cassandane-no-syslog
# Upstream ticket https://github.com/cyrusimap/cyrus-imapd/issues/1995
Source92: patch-cassandane-fix-annotator
# 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
@ -232,7 +228,6 @@ tar xf %SOURCE81
patch -p1 < %SOURCE91
patch -p1 < %SOURCE92
patch -p1 < %SOURCE93
cp %SOURCE82 cassandane.ini
# RF rpm-buildroot-usage
@ -461,11 +456,11 @@ tests=(
Metronome
# This tests coredumping and won't work on a machine where systemd
# intercepts coredumps.
# intercepts coredumps, which includes our builders.
Cassandane::Test::Core
# Upstream recommends disabling this because it has an internal race and
# will fail randomly.
# will fail randomly. https://github.com/cyrusimap/cassandane/issues/17
Master.sighup_recycling
# Fails because our Xapian is too old for proper CJK support. 1.5 will be
@ -483,10 +478,8 @@ tests=(
# 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
Sieve.rfc5490_mailboxexists_variables # This one is actually a Cyrus bug
Objectid.uniqueid
)
for i in ${tests[@]}; do exclude+=("!$i"); done
@ -637,6 +630,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
%changelog
* Fri Apr 13 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-13
- Update Cassandane, fixing a few tests and a class of weird random build
failures.
* 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

13
patch-cassandane-base-port
View File

@ -1,13 +0,0 @@
diff --git a/Cassandane/PortManager.pm b/Cassandane/PortManager.pm
index d1794eb..9a1e621 100644
--- a/Cassandane/PortManager.pm
+++ b/Cassandane/PortManager.pm
@@ -53,7 +53,7 @@ sub alloc
my $workerid = $ENV{TEST_UNIT_WORKER_ID} || '1';
die "Invalid TEST_UNIT_WORKER_ID - code not run in Worker context"
if (defined($workerid) && $workerid eq 'invalid');
- $base_port = 9100 + $max_ports * ($workerid-1);
+ $base_port = 19100 + $max_ports * ($workerid-1);
}
for (my $i = 0 ; $i < $max_ports ; $i++)
{

20
patch-cassandane-extra-logging
View File

@ -1,20 +0,0 @@
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);
}

13
patch-cassandane-unknown_calendars
View File

@ -1,13 +0,0 @@
diff --git a/Cassandane/Cyrus/JMAPCalendars.pm b/Cassandane/Cyrus/JMAPCalendars.pm
index 2179a26..2cf6fa6 100644
--- a/Cassandane/Cyrus/JMAPCalendars.pm
+++ b/Cassandane/Cyrus/JMAPCalendars.pm
@@ -1811,7 +1811,7 @@ sub test_setcalendarevents_move
"calendarId" => "nope",
}
}}, "R1"]]);
- $self->assert_str_equals($res->[0][1]{notUpdated}{$id}{type}, "calendarNotFound");
+ $self->assert_str_equals($res->[0][1]{notUpdated}{$id}{type}, "invalidProperties");
$self->assert_str_equals($res->[0][1]{newState}, $state);
xlog "get calendar $id from untouched calendar $calidA";

2
sources
View File

@ -1,3 +1,3 @@
SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
SHA512 (cyrus-imapd-3.0.5.tar.gz) = 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
SHA512 (cassandane-50a1ec2.tar.gz) = 9ede10c05ef59c520203182ec4278c2e52008d06606225272db91c587205bcbb500fd8f8ebe77d5d4d29693971400e950b79d4cf4ffac829272d9eeb8c3d8853
SHA512 (cassandane-389601b.tar.gz) = e7bfd8dd4b1cfccbf19f7ab26b5ba2a2ab6238f22646f36a4d2a82fe6c6e9ff78697e80f2da6e2a42fbeca754c8a3bf40353e7a53e4e635b198b6fd59567e483