diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2017-07-21 12:28:15 +0300 |
---|---|---|
committer | Olivier Goffart <olivier@woboq.com> | 2017-07-25 13:11:33 +0300 |
commit | a831164d657b4352079ac667d03937042e225787 (patch) | |
tree | dd82581ea3b0a14e0636f9fab96ccce7a2f2aeef /test/syncenginetestutils.h | |
parent | a41dc00160f1a2510ab71cfcff9ef0c61ff3f6e8 (diff) |
Revert "Revert "Discovery: consider also the "shared by me" as shared""
This reverts commit efa7821dd28491ad0b93fec53be6d4ad0f94f19f.
This reverts the revert, but also add a check that the server version
is bigger than 10.0
Issue #4788
Diffstat (limited to 'test/syncenginetestutils.h')
-rw-r--r-- | test/syncenginetestutils.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h index b90ff480b..062b62cea 100644 --- a/test/syncenginetestutils.h +++ b/test/syncenginetestutils.h @@ -289,6 +289,7 @@ public: QString etag = generateEtag(); QByteArray fileId = generateFileId(); QByteArray checksums; + QByteArray extraDavProperties; qint64 size = 0; char contentChar = 'W'; @@ -360,6 +361,7 @@ public: xml.writeTextElement(ocUri, QStringLiteral("permissions"), fileInfo.isShared ? QStringLiteral("SRDNVCKW") : QStringLiteral("RDNVCKW")); xml.writeTextElement(ocUri, QStringLiteral("id"), fileInfo.fileId); xml.writeTextElement(ocUri, QStringLiteral("checksums"), fileInfo.checksums); + buffer.write(fileInfo.extraDavProperties); xml.writeEndElement(); // prop xml.writeTextElement(davUri, QStringLiteral("status"), "HTTP/1.1 200 OK"); xml.writeEndElement(); // propstat @@ -826,7 +828,7 @@ public: OCC::SyncEngine &syncEngine() const { return *_syncEngine; } FileModifier &localModifier() { return _localModifier; } - FileModifier &remoteModifier() { return _fakeQnam->currentRemoteState(); } + FileInfo &remoteModifier() { return _fakeQnam->currentRemoteState(); } FileInfo currentLocalState() { QDir rootDir{_tempDir.path()}; FileInfo rootTemplate; |