From dcd389b636814e0b164e185a774394df6d9b32b0 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 15 May 2024 15:09:24 +0200 Subject: [PATCH] revert temp changes to get Windows CI being green Signed-off-by: Matthieu Gallien --- test/testcfapishellextensionsipc.cpp | 1 - test/testpermissions.cpp | 3 --- test/testsynccfapi.cpp | 20 ++++++++++---------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/test/testcfapishellextensionsipc.cpp b/test/testcfapishellextensionsipc.cpp index 12af7724c1cbd..9214c745f6f7f 100644 --- a/test/testcfapishellextensionsipc.cpp +++ b/test/testcfapishellextensionsipc.cpp @@ -384,7 +384,6 @@ private slots: loop.exec(); t.detach(); } - QEXPECT_FAIL("", "", Continue); QVERIFY(propfindRequestedSpy.count() == dummyFileStates.size()); } diff --git a/test/testpermissions.cpp b/test/testpermissions.cpp index a090d3b6fe141..5f82313175431 100644 --- a/test/testpermissions.cpp +++ b/test/testpermissions.cpp @@ -245,9 +245,6 @@ private slots: //2. // File should be deleted QVERIFY(!currentLocalState.find("normalDirectory_PERM_CKDNV_/canBeRemoved_PERM_D_.data")); -#ifdef Q_OS_WINDOWS - QEXPECT_FAIL("", "", Abort); -#endif QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/canBeRemoved_PERM_D_.data")); //3. diff --git a/test/testsynccfapi.cpp b/test/testsynccfapi.cpp index a306bc44e2b25..2613c054cdf96 100644 --- a/test/testsynccfapi.cpp +++ b/test/testsynccfapi.cpp @@ -1280,22 +1280,22 @@ private slots: loop.exec(); t.detach(); - // if (errorKind == NoError) { - // CFVERIFY_NONVIRTUAL(fakeFolder, "online/sub/file1"); - // } else { - // CFVERIFY_VIRTUAL(fakeFolder, "online/sub/file1"); - // } + if (errorKind == NoError) { + CFVERIFY_NONVIRTUAL(fakeFolder, "online/sub/file1"); + } else { + CFVERIFY_VIRTUAL(fakeFolder, "online/sub/file1"); + } // Nothing should change ItemCompletedSpy completeSpy(fakeFolder); QVERIFY(fakeFolder.syncOnce()); QVERIFY(completeSpy.isEmpty()); - // if (errorKind == NoError) { - // CFVERIFY_NONVIRTUAL(fakeFolder, "online/sub/file1"); - // } else { - // CFVERIFY_VIRTUAL(fakeFolder, "online/sub/file1"); - // } + if (errorKind == NoError) { + CFVERIFY_NONVIRTUAL(fakeFolder, "online/sub/file1"); + } else { + CFVERIFY_VIRTUAL(fakeFolder, "online/sub/file1"); + } } void testDataFingerPrint()