From: Christian Kamm <mail@ckamm.de>
Date: Wed, 13 Feb 2019 10:17:51 +0000 (+0100)
Subject: Tests: Fix permission propagation check
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~290
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=60cb5d3b343b39328995d93ebe7cee9d492d7c0c;p=nextcloud-desktop.git

Tests: Fix permission propagation check

It was using the wrong path to the conflict file.
---

diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp
index b69588ec5..395a10361 100644
--- a/test/testsyncengine.cpp
+++ b/test/testsyncengine.cpp
@@ -693,14 +693,9 @@ private slots:
         QCOMPARE(QFileInfo(fakeFolder.localPath() + "A/a1").permissions(), perm);
         QCOMPARE(QFileInfo(fakeFolder.localPath() + "A/a2").permissions(), perm);
 
-        // Currently the umask applies to conflict files
-        auto octmask = umask(0);
-        umask(octmask);
-        // Qt uses 0x1, 0x2, 0x4 for "other"; 0x10, 0x20, 0x40 for "group" etc
-        auto qtmask = (octmask & 07) + 0x10 * ((octmask & 070) >> 3) + 0x100 * ((octmask & 0700) >> 6);
-        auto maskedPerm = QFileDevice::Permission(perm & (~qtmask));
-        auto conflictName = fakeFolder.syncJournal().conflictRecord("A/a2").path;
-        QCOMPARE(QFileInfo(fakeFolder.localPath() + conflictName).permissions(), maskedPerm);
+        auto conflictName = fakeFolder.syncJournal().conflictRecord(fakeFolder.syncJournal().conflictRecordPaths().first()).path;
+        QVERIFY(conflictName.contains("A/a2"));
+        QCOMPARE(QFileInfo(fakeFolder.localPath() + conflictName).permissions(), perm);
     }
 #endif
 };