]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Make sure that we invalidate parents on blacklisted items
authorJocelyn Turcotte <jturcotte@woboq.com>
Fri, 5 Aug 2016 15:18:16 +0000 (17:18 +0200)
committerJocelyn Turcotte <jturcotte@woboq.com>
Wed, 17 Aug 2016 13:39:30 +0000 (15:39 +0200)
Add a missing call that we currently only do in slotItemCompleted.
This would normally only affect the first sync and would have
gotten properly update at the end of the sync anyway.

src/libsync/syncfilestatustracker.cpp
test/testsyncfilestatustracker.cpp

index 152cd0dceb0e6e80b5b27b8d69c0d80a670ac0e2..547cfdc37d8d6f33b3a0dd2c22a685edab036eb6 100644 (file)
@@ -150,6 +150,7 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector& items)
 
         if (showErrorInSocketApi(*item)) {
             _syncProblems[item->_file] = SyncFileStatus::StatusError;
+            invalidateParentPaths(item->destination());
         } else if (showWarningInSocketApi(*item)) {
             _syncProblems[item->_file] = SyncFileStatus::StatusWarning;
         }
index 35fdbbf20cc0209ad12801198719fd21675a478c..f7fcb528d62806dd73eb65bd9fce82da7039d158 100644 (file)
@@ -310,10 +310,8 @@ private slots:
         // The root should show SYNC even though there is an error underneath,
         // since C/c1 is syncing and the SYNC status has priority.
         QCOMPARE(statusSpy.statusOf(""), SyncFileStatus(SyncFileStatus::StatusSync));
-        QEXPECT_FAIL("", "Only one blacklist item underneath, we shouldn't be showing SYNC.", Continue);
         QCOMPARE(statusSpy.statusOf("A"), SyncFileStatus(SyncFileStatus::StatusWarning));
         QCOMPARE(statusSpy.statusOf("A/a1"), SyncFileStatus(SyncFileStatus::StatusError));
-        QEXPECT_FAIL("", "Only one blacklist item underneath, we shouldn't be showing SYNC.", Continue);
         QCOMPARE(statusSpy.statusOf("B"), SyncFileStatus(SyncFileStatus::StatusWarning));
         QCOMPARE(statusSpy.statusOf("B/b0"), SyncFileStatus(SyncFileStatus::StatusError));
         QCOMPARE(statusSpy.statusOf("C"), SyncFileStatus(SyncFileStatus::StatusSync));