From: Olivier Goffart <olivier@woboq.com>
Date: Wed, 25 Jan 2017 18:19:48 +0000 (+0100)
Subject: Merge pull request #5480 from owncloud/chunking-ng-cleanup
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~872
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=268fc97a714ad1be18e6727c2f0ca8d2b9b755df;p=nextcloud-desktop.git

Merge pull request #5480 from owncloud/chunking-ng-cleanup

Chunking ng cleanup
---

268fc97a714ad1be18e6727c2f0ca8d2b9b755df
diff --cc test/syncenginetestutils.h
index c59495243,a4a12884f..0c4bf6cae
--- a/test/syncenginetestutils.h
+++ b/test/syncenginetestutils.h
@@@ -586,13 -598,12 +598,13 @@@ public
          Q_ASSERT(sourceFolder->isDir);
          int count = 0;
          int size = 0;
-         char payload = '*';
+         char payload = '\0';
  
          do {
 -            if (!sourceFolder->children.contains(QString::number(count)))
 +            QString chunkName = QString::number(count).rightJustified(8, '0');
 +            if (!sourceFolder->children.contains(chunkName))
                  break;
 -            auto &x = sourceFolder->children[QString::number(count)];
 +            auto &x = sourceFolder->children[chunkName];
              Q_ASSERT(!x.isDir);
              Q_ASSERT(x.size > 0); // There should not be empty chunks
              size += x.size;