diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2018-12-03 19:06:22 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2018-12-03 19:06:22 +0300 |
| commit | 94a82cbb596edc2ae85198a111a4c08e8a1d2e3c (patch) | |
| tree | 0d9d39bd3fa42907ca4e4d806c603d28cd390445 /test/testsyncconflict.cpp | |
| parent | c3277331eb9e869bde110bef46758f6b471359d8 (diff) | |
Test: fix compilaiton after merge
Diffstat (limited to 'test/testsyncconflict.cpp')
| -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())); }(); } } |