File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -453,7 +453,10 @@ private slots:
453453 QCOMPARE (entry._errorCategory , SyncJournalErrorBlacklistRecord::InsufficientRemoteStorage);
454454 }
455455
456- // Server deletes A again. big.txt must still be protected.
456+ // Server deletes A again. The real client uses DatabaseAndFilesystem with no local paths
457+ // (server-triggered sync, no local changes). The fix in startAsync() must force NormalQuery
458+ // for A's subdirectory job so that big.txt is discovered and checkNewDeleteConflict fires.
459+ fakeFolder.syncEngine ().setLocalDiscoveryOptions (OCC ::LocalDiscoveryStyle::DatabaseAndFilesystem);
457460 fakeFolder.remoteModifier ().remove (QStringLiteral (" A" ));
458461 QVERIFY (!fakeFolder.syncOnce ());
459462 QVERIFY (fakeFolder.currentLocalState ().find (QStringLiteral (" A/big.txt" )));
You can’t perform that action at this time.
0 commit comments