Skip to content

Commit

Permalink
revert temp changes to get Windows CI being green
Browse files Browse the repository at this point in the history
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
  • Loading branch information
mgallien committed Nov 29, 2024
1 parent 7a41a56 commit dcd389b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
1 change: 0 additions & 1 deletion test/testcfapishellextensionsipc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ private slots:
loop.exec();
t.detach();
}
QEXPECT_FAIL("", "", Continue);
QVERIFY(propfindRequestedSpy.count() == dummyFileStates.size());
}

Expand Down
3 changes: 0 additions & 3 deletions test/testpermissions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
20 changes: 10 additions & 10 deletions test/testsynccfapi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit dcd389b

Please sign in to comment.