diff options
| author | Jocelyn Turcotte <jturcotte@woboq.com> | 2017-08-24 18:07:22 +0300 |
|---|---|---|
| committer | Jocelyn Turcotte <jturcotte@woboq.com> | 2017-09-18 12:46:09 +0300 |
| commit | 0e97770c47e6000f6ef11251c81e48a9879d7760 (patch) | |
| tree | 595e30ff5380399f39455b53cfcf43ac242f19b0 /test/testsyncengine.cpp | |
| parent | 3d7bd7583b45a7f3ba7394a4daa58793053b5558 (diff) | |
Remove SyncFileItem::log
This remove the remaining "other" fields of the sync log to save a
bit of memory.
other_etag and other_fileId don't give much information to the users
and other_instruction will always be INST_NONE anyway.
other_modtime and other_size are kept since they are sometimes used.
They were renamed to have a bit more meaningful name.
SyncEngine::checkPermissions will now fetch its information from the
csync trees since they are now preserved until right after this point.
Fixes #3213
Diffstat (limited to 'test/testsyncengine.cpp')
| -rw-r--r-- | test/testsyncengine.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp index 716bc5329..4baa43a13 100644 --- a/test/testsyncengine.cpp +++ b/test/testsyncengine.cpp @@ -441,8 +441,8 @@ private slots: QCOMPARE(a1->_size, quint64(5)); QCOMPARE(Utility::qDateTimeFromTime_t(a1->_modtime), changedMtime); - QCOMPARE(a1->log._other_size, quint64(4)); - QCOMPARE(Utility::qDateTimeFromTime_t(a1->log._other_modtime), initialMtime); + QCOMPARE(a1->_previousSize, quint64(4)); + QCOMPARE(Utility::qDateTimeFromTime_t(a1->_previousModtime), initialMtime); // b2: should have remote size and modtime QVERIFY(b1); @@ -450,8 +450,8 @@ private slots: QCOMPARE(b1->_direction, SyncFileItem::Down); QCOMPARE(b1->_size, quint64(17)); QCOMPARE(Utility::qDateTimeFromTime_t(b1->_modtime), changedMtime); - QCOMPARE(b1->log._other_size, quint64(16)); - QCOMPARE(Utility::qDateTimeFromTime_t(b1->log._other_modtime), initialMtime); + QCOMPARE(b1->_previousSize, quint64(16)); + QCOMPARE(Utility::qDateTimeFromTime_t(b1->_previousModtime), initialMtime); // c1: conflicts are downloads, so remote size and modtime QVERIFY(c1); @@ -459,8 +459,8 @@ private slots: QCOMPARE(c1->_direction, SyncFileItem::None); QCOMPARE(c1->_size, quint64(25)); QCOMPARE(Utility::qDateTimeFromTime_t(c1->_modtime), changedMtime2); - QCOMPARE(c1->log._other_size, quint64(26)); - QCOMPARE(Utility::qDateTimeFromTime_t(c1->log._other_modtime), changedMtime); + QCOMPARE(c1->_previousSize, quint64(26)); + QCOMPARE(Utility::qDateTimeFromTime_t(c1->_previousModtime), changedMtime); }); QVERIFY(fakeFolder.syncOnce()); |