Merge pull request #8129 from nextcloud/backport/8128/stable-3.16

[stable-3.16] remove bogus check that tried to check for existing case clash conflict
This commit is contained in:
Matthieu Gallien 2025-04-08 23:04:39 +02:00 committed by GitHub
commit 0c50e0fafe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1849,12 +1849,6 @@ private slots:
QVERIFY(conflictSolverCaseClashForFolderDone.wait());
QVERIFY(fakeFolder.syncOnce());
// verify no case clash conflicts folder items are found
caseClashConflictFolderItemLower = completeSpy.findItem(diverseConflictsFolderPath + "/" + testLowerCaseFolder);
caseClashConflictFolderItemUpper = completeSpy.findItem(diverseConflictsFolderPath + "/" + testUpperCaseFolder);
QVERIFY((!caseClashConflictFolderItemLower || caseClashConflictFolderItemLower->_file.isEmpty())
&& (!caseClashConflictFolderItemUpper || caseClashConflictFolderItemUpper->_file.isEmpty()));
// veriy invalid filename conflict folder item is still present
invalidFilenameConflictFolderItem = completeSpy.findItem(diverseConflictsFolderPath + "/" + testInvalidCharFolder);
completeSpy.clear();