diff --git a/test/testsynccfapi.cpp b/test/testsynccfapi.cpp index eb4b8570d958d..d710778b0f876 100644 --- a/test/testsynccfapi.cpp +++ b/test/testsynccfapi.cpp @@ -1518,7 +1518,7 @@ private slots: fakeFolder.remoteModifier().rename("B", "_B"); QVERIFY(fakeFolder.syncOnce()); - QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState()); + QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState()); QVERIFY(fakeFolder.currentRemoteState().find("_A/a1m")); QVERIFY(fakeFolder.currentRemoteState().find("_B/b1m")); @@ -1528,7 +1528,7 @@ private slots: fakeFolder.localModifier().rename("_A", "S/A"); fakeFolder.remoteModifier().rename("_B", "S/B"); QVERIFY(fakeFolder.syncOnce()); - QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState()); + QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState()); QVERIFY(fakeFolder.currentRemoteState().find("S/A/a2m")); QVERIFY(fakeFolder.currentRemoteState().find("S/B/b2m")); } @@ -1551,7 +1551,8 @@ private slots: fakeFolder.remoteModifier().insert("first folder/second folder/second file3"); QVERIFY(fakeFolder.syncOnce()); - QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState()); + QEXPECT_FAIL("", "windows VFS breaks comparison using currentLocalState()", Abort); + QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState()); } void testSyncFolderNewDeleteConflictExpectDeletion() diff --git a/test/testsyncmove.cpp b/test/testsyncmove.cpp index 62d6217d81907..8b5e29b166ee4 100644 --- a/test/testsyncmove.cpp +++ b/test/testsyncmove.cpp @@ -868,7 +868,7 @@ private slots: fakeFolder.remoteModifier().rename("B", "_B"); QVERIFY(fakeFolder.syncOnce()); - QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState()); + QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState()); QVERIFY(fakeFolder.currentRemoteState().find("_A/a1m")); QVERIFY(fakeFolder.currentRemoteState().find("_B/b1m")); QCOMPARE(counter.nDELETE, 0); @@ -883,7 +883,7 @@ private slots: fakeFolder.localModifier().rename("_A", "S/A"); fakeFolder.remoteModifier().rename("_B", "S/B"); QVERIFY(fakeFolder.syncOnce()); - QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState()); + QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState()); QVERIFY(fakeFolder.currentRemoteState().find("S/A/a2m")); QVERIFY(fakeFolder.currentRemoteState().find("S/B/b2m")); QCOMPARE(counter.nDELETE, 0); @@ -907,7 +907,7 @@ private slots: fakeFolder.remoteModifier().rename("B/b2", "C/b2"); QVERIFY(fakeFolder.syncOnce()); - QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState()); + QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState()); QVERIFY(fakeFolder.currentRemoteState().find("A/b1")); QVERIFY(fakeFolder.currentRemoteState().find("C/b1")); QVERIFY(fakeFolder.currentRemoteState().find("A/b2"));