mirror of
https://github.com/nextcloud/desktop.git
synced 2025-10-26 11:17:43 +00:00
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:
commit
0c50e0fafe
@ -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();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user