From: Olivier Goffart Date: Thu, 9 Mar 2017 09:35:58 +0000 (+0100) Subject: Fix TestSyncEngine::testDirDownloadWithError X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~793 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1a98b49f1b90038abbbf14740beaa2b90e4bae7c;p=nextcloud-desktop.git Fix TestSyncEngine::testDirDownloadWithError On master, the scheduling is different and the tasks abort in another order --- diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp index 5567608d5..59314222f 100644 --- a/test/testsyncengine.cpp +++ b/test/testsyncengine.cpp @@ -251,8 +251,10 @@ private slots: qDebug() << item->_file << item->_isDirectory << item->_status; QVERIFY(!seen.contains(item->_file)); // signal only sent once per item seen.insert(item->_file); - if (item->_file == "Y/Z/d2" || item->_file == "Y/Z/d3") { + if (item->_file == "Y/Z/d2") { QVERIFY(item->_status == SyncFileItem::FatalError); + } else if(item->_file == "Y/Z/d3") { + QVERIFY(item->_status != SyncFileItem::Success); } QVERIFY(item->_file != "Y/Z/d9"); // we should have aborted the sync before d9 starts }