[Python-apps-commits] r13844 - in packages/khal/trunk/debian (3 files)

[fpytloun-guest at users.alioth.debian.org]

    Date: Monday, January 2, 2017 @ 21:45:50
  Author: fpytloun-guest
Revision: 13844

Workaround occasionally failing test, closes #844081

Added:
  packages/khal/trunk/debian/patches/0006-Mark-test_default_calendar-as-xfail.patch
Modified:
  packages/khal/trunk/debian/changelog
  packages/khal/trunk/debian/patches/series

Modified: packages/khal/trunk/debian/changelog
===================================================================
--- packages/khal/trunk/debian/changelog	2017-01-02 21:34:25 UTC (rev 13843)
+++ packages/khal/trunk/debian/changelog	2017-01-02 21:45:50 UTC (rev 13844)
@@ -1,3 +1,10 @@
+khal (0.8.4-2) unstable; urgency=medium
+
+  * d/patches: disable occasionally failing test_default_calendar
+    (Closes: #844081)
+
+ -- Filip Pytloun <filip at pytloun.cz>  Mon, 02 Jan 2017 22:18:08 +0100
+
 khal (0.8.4-1) unstable; urgency=high
 
   * New upstream release

Added: packages/khal/trunk/debian/patches/0006-Mark-test_default_calendar-as-xfail.patch
===================================================================
--- packages/khal/trunk/debian/patches/0006-Mark-test_default_calendar-as-xfail.patch	                        (rev 0)
+++ packages/khal/trunk/debian/patches/0006-Mark-test_default_calendar-as-xfail.patch	2017-01-02 21:45:50 UTC (rev 13844)
@@ -0,0 +1,24 @@
+From 5a49a74eb5bb54da6760a19140f880b4b620a104 Mon Sep 17 00:00:00 2001
+From: Christian Geier <geier at lostpackets.de>
+Date: Sun, 18 Dec 2016 20:27:14 +0100
+Subject: [PATCH] Mark test_default_calendar as xfail
+
+---
+ tests/khalendar_test.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/khalendar_test.py b/tests/khalendar_test.py
+index fd8dcc6..1573316 100644
+--- a/tests/khalendar_test.py
++++ b/tests/khalendar_test.py
+@@ -321,6 +321,7 @@ class TestDbCreation(object):
+             CalendarCollection(calendars, dbpath=dbpath, locale=aux.locale)
+ 
+ 
++ at pytest.mark.xfail
+ def test_default_calendar(coll_vdirs):
+     """test if an update to the vdir is detected by the CalendarCollection"""
+     coll, vdirs = coll_vdirs
+-- 
+2.1.4
+

Modified: packages/khal/trunk/debian/patches/series
===================================================================
--- packages/khal/trunk/debian/patches/series	2017-01-02 21:34:25 UTC (rev 13843)
+++ packages/khal/trunk/debian/patches/series	2017-01-02 21:45:50 UTC (rev 13844)
@@ -3,3 +3,4 @@
 0003-Fix-intersphinx-mapping.patch
 0004-Fix-tests-failing-due-to-timezone.patch
 0005-Avoid-privacy-breach-in-sphinx-doc.patch
+0006-Mark-test_default_calendar-as-xfail.patch