revert temp changes to get Windows CI being green

Signed-off-by: Matthieu Gallien <[email protected]>
nextcloud · May 15, 2024 · cebf8b3 · cebf8b3
1 parent 6a6138c
commit cebf8b3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git 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/testlocaldiscovery.cpp b/test/testlocaldiscovery.cpp
@@ -346,9 +346,6 @@ private slots:
         QCOMPARE(completeSpy.findItem(fileWithSpaces4)->_status, SyncFileItem::Status::Success);
         QCOMPARE(completeSpy.findItem(fileWithSpaces5)->_status, SyncFileItem::Status::Success);
         QCOMPARE(completeSpy.findItem(fileWithSpaces6)->_status, SyncFileItem::Status::Success);
-#ifdef Q_OS_WINDOWS
-        QEXPECT_FAIL("", "", Continue);
-#endif
         QCOMPARE(completeSpy.findItem(QStringLiteral(" with spaces "))->_status, SyncFileItem::Status::Success);
     }
 

diff --git a/test/testpermissions.cpp b/test/testpermissions.cpp
@@ -227,9 +227,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
@@ -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()