summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Manuel Santamaría Lema <panfaust@gmail.com>2017-06-15 22:13:45 (GMT)
committerJosé Manuel Santamaría Lema <panfaust@gmail.com>2017-06-15 22:13:45 (GMT)
commit462c623d4a251be3ae6080454fc0c87cb3a89970 (patch)
treee37d6b50c2932b4e145f315ea001dfbf113db48b
parent9f2ff18341b8efb0615cdc463c4c70d47b3f9266 (diff)
Add upstream_fix_kfileitemmodel_test.diff
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/upstream_fix_kfileitemmodel_test.diff31
3 files changed, 33 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 713ed17..542f2f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dolphin (4:17.04.2-0ubuntu1) UNRELEASED; urgency=low
* New upstream release (17.04.1)
* Install translations and add Breaks/Replaces against kde-l10n
* New upstream release (17.04.2)
+ * Add upstream_fix_kfileitemmodel_test.diff
-- José Manuel Santamaría Lema <panfaust@gmail.com> Wed, 07 Jun 2017 06:35:28 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..dd0827a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_fix_kfileitemmodel_test.diff
diff --git a/debian/patches/upstream_fix_kfileitemmodel_test.diff b/debian/patches/upstream_fix_kfileitemmodel_test.diff
new file mode 100644
index 0000000..0f039c8
--- /dev/null
+++ b/debian/patches/upstream_fix_kfileitemmodel_test.diff
@@ -0,0 +1,31 @@
+From f6095c86c17be60e7f3b3ce1e02b40777600725e Mon Sep 17 00:00:00 2001
+From: Elvis Angelaccio <elvis.angelaccio@kde.org>
+Date: Wed, 10 May 2017 12:19:12 +0200
+Subject: Fix kfileitemmodeltest
+
+Commit 6dcbb8127c introduced the isHidden role, update the test
+accordingly.
+---
+ src/tests/kfileitemmodeltest.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
+index 59ff630..b8e0895 100644
+--- a/src/tests/kfileitemmodeltest.cpp
++++ b/src/tests/kfileitemmodeltest.cpp
+@@ -135,10 +135,11 @@ void KFileItemModelTest::cleanup()
+ void KFileItemModelTest::testDefaultRoles()
+ {
+ const QSet<QByteArray> roles = m_model->roles();
+- QCOMPARE(roles.count(), 3);
++ QCOMPARE(roles.count(), 4);
+ QVERIFY(roles.contains("text"));
+ QVERIFY(roles.contains("isDir"));
+ QVERIFY(roles.contains("isLink"));
++ QVERIFY(roles.contains("isHidden"));
+ }
+
+ void KFileItemModelTest::testDefaultSortRole()
+--
+cgit v0.11.2
+