[Python-apps-commits] r14091 - in packages/khal/trunk/debian/patches (3 files)
fpytloun-guest at users.alioth.debian.org
fpytloun-guest at users.alioth.debian.org
Wed May 31 20:27:53 UTC 2017
Date: Wednesday, May 31, 2017 @ 20:27:52
Author: fpytloun-guest
Revision: 14091
Cleanup patches
Added:
packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
Deleted:
packages/khal/trunk/debian/patches/0006-Tolerate-occassionally-failing-update_db-related-tes.patch
packages/khal/trunk/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
Added: packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
===================================================================
--- packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch (rev 0)
+++ packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch 2017-05-31 20:27:52 UTC (rev 14091)
@@ -0,0 +1,45 @@
+From 3120c689448b6218d4f0209bc630e4582777677a Mon Sep 17 00:00:00 2001
+From: Filip Pytloun <filip at pytloun.cz>
+Date: Thu, 20 Apr 2017 20:54:05 +0200
+Subject: [PATCH 6/6] Timezone tests may fail due to older pytz with newer TZ
+ definitions
+
+---
+ tests/event_test.py | 1 +
+ tests/vtimezone_test.py | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/tests/event_test.py b/tests/event_test.py
+index 79ff17b..8a524c1 100644
+--- a/tests/event_test.py
++++ b/tests/event_test.py
+@@ -299,6 +299,7 @@ def test_event_dt_long():
+ '09.04.2014 09:30-12.04.2014 10:30 An Event \x1b[0m'
+
+
++ at pytest.mark.xfail
+ def test_event_no_dst(pytz_version):
+ """test the creation of a corect VTIMEZONE for timezones with no dst"""
+ event_no_dst = _get_text('event_no_dst')
+diff --git a/tests/vtimezone_test.py b/tests/vtimezone_test.py
+index d810c64..e4d0fb8 100644
+--- a/tests/vtimezone_test.py
++++ b/tests/vtimezone_test.py
+@@ -1,5 +1,6 @@
+ from datetime import datetime as datetime
+ import pytz
++import pytest
+ from khal.khalendar.event import create_timezone
+
+ berlin = pytz.timezone('Europe/Berlin')
+@@ -61,6 +62,7 @@ def test_berlin_rdate():
+ assert vberlin_dst in vberlin
+
+
++ at pytest.mark.xfail
+ def test_bogota(pytz_version):
+ vbogota = [b'BEGIN:VTIMEZONE',
+ b'TZID:America/Bogota',
+--
+2.11.0
+
Deleted: packages/khal/trunk/debian/patches/0006-Tolerate-occassionally-failing-update_db-related-tes.patch
===================================================================
--- packages/khal/trunk/debian/patches/0006-Tolerate-occassionally-failing-update_db-related-tes.patch 2017-05-31 20:26:22 UTC (rev 14090)
+++ packages/khal/trunk/debian/patches/0006-Tolerate-occassionally-failing-update_db-related-tes.patch 2017-05-31 20:27:52 UTC (rev 14091)
@@ -1,50 +0,0 @@
-From a78b125eb4a449aa5c829f9344f00afc37b39a1e 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] Tolerate occassionally failing update_db-related tests
-
-It's not possible to backport fix forcing fsync from newer major release as it
-refactors most of code.
----
- tests/khalendar_test.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/khalendar_test.py b/tests/khalendar_test.py
-index fd8dcc6..761bed5 100644
---- a/tests/khalendar_test.py
-+++ b/tests/khalendar_test.py
-@@ -65,6 +65,7 @@ class TestCalendar(object):
- else:
- mtimes[cal] = mtime
-
-+ @pytest.mark.xfail
- def test_db_needs_update(self, coll_vdirs):
- coll, vdirs = coll_vdirs
-
-@@ -221,6 +222,7 @@ class TestCollection(object):
- assert len(events) == 1
- assert events[0].calendar == cal2
-
-+ @pytest.mark.xfail
- def test_update_event(self, coll_vdirs):
- """updating one event"""
- coll, vdirs = coll_vdirs
-@@ -321,6 +323,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
-@@ -341,6 +344,7 @@ def test_default_calendar(coll_vdirs):
- assert len(list(coll.get_events_on(today))) == 0
-
-
-+ at pytest.mark.xfail
- def test_only_update_old_event(coll_vdirs, monkeypatch):
- coll, vdirs = coll_vdirs
-
---
-2.11.0
-
Deleted: packages/khal/trunk/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
===================================================================
--- packages/khal/trunk/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch 2017-05-31 20:26:22 UTC (rev 14090)
+++ packages/khal/trunk/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch 2017-05-31 20:27:52 UTC (rev 14091)
@@ -1,45 +0,0 @@
-From 5953d313fa9bc4f48ffaa4f941f665a32dce62b3 Mon Sep 17 00:00:00 2001
-From: Filip Pytloun <filip at pytloun.cz>
-Date: Thu, 20 Apr 2017 20:54:05 +0200
-Subject: [PATCH 7/7] Timezone tests may fail due to older pytz with newer TZ
- definitions
-
----
- tests/event_test.py | 1 +
- tests/vtimezone_test.py | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/tests/event_test.py b/tests/event_test.py
-index 121efc2..107acc0 100644
---- a/tests/event_test.py
-+++ b/tests/event_test.py
-@@ -246,6 +246,7 @@ def test_event_dt_long():
- assert event.event_description == '09.04.2014 09:30 - 12.04.2014 10:30: An Event'
-
-
-+ at pytest.mark.xfail
- def test_event_no_dst():
- """test the creation of a corect VTIMEZONE for timezones with no dst"""
- event_no_dst = _get_text('event_no_dst')
-diff --git a/tests/vtimezone_test.py b/tests/vtimezone_test.py
-index cf20eb0..89c369e 100644
---- a/tests/vtimezone_test.py
-+++ b/tests/vtimezone_test.py
-@@ -1,5 +1,6 @@
- from datetime import datetime as datetime
- import pytz
-+import pytest
- from khal.khalendar.event import create_timezone
-
- berlin = pytz.timezone('Europe/Berlin')
-@@ -61,6 +62,7 @@ def test_berlin_rdate():
- assert vberlin_dst in vberlin
-
-
-+ at pytest.mark.xfail
- def test_bogota():
- vbogota = [b'BEGIN:VTIMEZONE',
- b'TZID:America/Bogota',
---
-2.11.0
-
More information about the Python-apps-commits
mailing list