From ddb6b3b2625f41e0271c82e2bf1adedbc462b0db Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Wed, 8 Feb 2017 17:31:13 +0100 Subject: [PATCH] Fix TestSyncEngine::abortAfterFailedMkdir (again) It could be possible that _firstJob is marked as finished if aborted before its parent PropagateDirectory was marked as finished, allowing a posted scheduleNextJob call to schedule the child job in-between. --- src/libsync/owncloudpropagator.h | 2 +- test/testsyncengine.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index ef5db3b1e..5a3763d49 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -227,7 +227,7 @@ public: private slots: bool possiblyRunNextJob(PropagatorJob *next) { if (next->_state == NotYetStarted) { - connect(next, SIGNAL(finished(SyncFileItem::Status)), this, SLOT(slotSubJobFinished(SyncFileItem::Status)), Qt::QueuedConnection); + connect(next, SIGNAL(finished(SyncFileItem::Status)), this, SLOT(slotSubJobFinished(SyncFileItem::Status))); connect(next, SIGNAL(itemCompleted(const SyncFileItemPtr &)), this, SIGNAL(itemCompleted(const SyncFileItemPtr &))); connect(next, SIGNAL(progress(const SyncFileItem &,quint64)), this, SIGNAL(progress(const SyncFileItem &,quint64))); connect(next, SIGNAL(ready()), this, SIGNAL(ready())); diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp index ae5296ea1..31f15df8e 100644 --- a/test/testsyncengine.cpp +++ b/test/testsyncengine.cpp @@ -214,7 +214,6 @@ private slots: } void abortAfterFailedMkdir() { - QSKIP("Skip for 2.3"); FakeFolder fakeFolder{FileInfo{}}; QSignalSpy finishedSpy(&fakeFolder.syncEngine(), SIGNAL(finished(bool))); fakeFolder.serverErrorPaths().append("NewFolder"); -- 2.30.2