diff options
| -rw-r--r-- | test/testsyncconflict.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/testsyncconflict.cpp b/test/testsyncconflict.cpp index fe970d49e..fd750e641 100644 --- a/test/testsyncconflict.cpp +++ b/test/testsyncconflict.cpp @@ -114,7 +114,8 @@ private slots: conflictMap[baseFileId] = conflictFile; [&] { QVERIFY(!baseFileId.isEmpty()); - QCOMPARE(request.rawHeader("OC-ConflictInitialBasePath"), Utility::conflictFileBaseName(conflictFile.toUtf8())); + QCOMPARE(request.rawHeader("OC-ConflictInitialBasePath"), + Utility::conflictFileBaseNameFromPattern(conflictFile.toUtf8())); }(); } } @@ -164,7 +165,8 @@ private slots: conflictMap[baseFileId] = conflictFile; [&] { QVERIFY(!baseFileId.isEmpty()); - QCOMPARE(request.rawHeader("OC-ConflictInitialBasePath"), Utility::conflictFileBaseName(conflictFile.toUtf8())); + QCOMPARE(request.rawHeader("OC-ConflictInitialBasePath"), + Utility::conflictFileBaseNameFromPattern(conflictFile.toUtf8())); }(); } } |