Fix unit tests

1 files changed, 10 insertions, 0 deletions

diff --git a/test/testutils/syncenginetestutils.cpp b/test/testutils/syncenginetestutils.cpp
index 63f44b154..be3d7f984 100644
--- a/test/testutils/syncenginetestutils.cpp
+++ b/test/testutils/syncenginetestutils.cpp
@@ -934,6 +934,7 @@ void FakeFolder::switchToVfs(QSharedPointer<OCC::Vfs> vfs)
     vfsParams.remotePath = QLatin1Char('/');
     vfsParams.account = _account;
     vfsParams.journal = _journalDb.get();
+    vfsParams.providerName = QStringLiteral("OC-TEST");
     vfsParams.providerDisplayName = QStringLiteral("OC-TEST");
     vfsParams.providerVersion = QStringLiteral("0.1");
     QObject::connect(_syncEngine.get(), &QObject::destroyed, vfs.data(), [vfs]() {
@@ -941,7 +942,16 @@ void FakeFolder::switchToVfs(QSharedPointer<OCC::Vfs> vfs)
         vfs->unregisterFolder();
     });
 
+    QObject::connect(vfs.get(), &OCC::Vfs::error, vfs.get(), [](const QString &error) {
+        QFAIL(qUtf8Printable(error));
+    });
+    QSignalSpy spy(vfs.get(), &OCC::Vfs::started);
     vfs->start(vfsParams);
+
+    // don't use QVERIFY outside of the test slot
+    if (spy.isEmpty() && !spy.wait()) {
+        QFAIL("VFS Setup failed");
+    }
 }
 
 FileInfo FakeFolder::currentLocalState()