testing: ignore Memotoo eds_memo update failures

Memotoo randomly decides to send back an unmodified iCalendar 2.0 memo.
This does not hurt, so don't check the exact sync result when testing
Memotoo.
This commit is contained in:
Patrick Ohly 2014-10-10 03:00:24 -07:00
parent d50e61db85
commit 3f5e25ac31
2 changed files with 9 additions and 1 deletions

View File

@ -3128,12 +3128,14 @@ void SyncTests::doCopy() {
CT_ASSERT_NO_THROW(deleteAll());
accessClientB->deleteAll();
bool allowLocalUpdate = getenv("CLIENT_TEST_MAY_COPY_BACK") != NULL;
// insert into first database, copy to server
CT_ASSERT_NO_THROW(allSourcesInsert());
doSync(__FILE__, __LINE__,
"send",
SyncOptions(SYNC_TWO_WAY,
CheckSyncReport(0,0,0, 1,0,0, true, SYNC_TWO_WAY)));
CheckSyncReport(0, allowLocalUpdate? -1 : 0, 0, 1,0,0, true, SYNC_TWO_WAY)));
// copy into second database
accessClientB->doSync(__FILE__, __LINE__,

View File

@ -2428,6 +2428,12 @@ memotootest = SyncEvolutionTest("memotoo", compile,
"eds_event",
"eds_task",
"eds_memo" ],
# Under heavy load the timing ends up such that
# the Memotoo server sends an eds_memo item that
# it just got back. That does not happen reliably.
# If it happens, the returned content is the same,
# so allow this to happen although it is redundant.
"CLIENT_TEST_MAY_COPY_BACK=1 "
"CLIENT_TEST_NOCHECK_SYNCMODE=1 "
"CLIENT_TEST_NUM_ITEMS=10 "
"CLIENT_TEST_FAILURES="