python/python-vdirsyncer
SHA256
14
0
Fork 0
forked from pool/python-vdirsyncer
Code Pull Requests Activity

Accepting request 701268 from home:pgajdos

Browse Source 
- added patches
  default deadline (200ms) is too short for obs
  + python-vdirsyncer-shift-deadline.patch

OBS-URL: https://build.opensuse.org/request/show/701268
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-vdirsyncer?expand=0&rev=12
This commit is contained in:
Tomáš Chvátal
2019-05-07 10:11:51 +00:00
committed by Git OBS Bridge
parent 8b2414146a
commit 5c342cdb88
4 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python-vdirsyncer-fix-tests.patch
View File

@@ -1,7 +1,7 @@
Index: vdirsyncer-0.16.7/tests/conftest.py
===================================================================
--- vdirsyncer-0.16.7.orig/tests/conftest.py 2018-02-16 19:48:40.000000000 +0100
+++ vdirsyncer-0.16.7/tests/conftest.py 2019-05-06 15:24:28.233806166 +0200
+++ vdirsyncer-0.16.7/tests/conftest.py 2019-05-07 07:42:51.601117380 +0200
@@ -7,7 +7,7 @@ import os
import click_log
@@ -30,7 +30,7 @@ Index: vdirsyncer-0.16.7/tests/conftest.py
Index: vdirsyncer-0.16.7/tests/unit/test_repair.py
===================================================================
--- vdirsyncer-0.16.7.orig/tests/unit/test_repair.py 2018-07-19 21:07:31.000000000 +0200
+++ vdirsyncer-0.16.7/tests/unit/test_repair.py 2019-05-06 15:24:59.781963794 +0200
+++ vdirsyncer-0.16.7/tests/unit/test_repair.py 2019-05-07 07:37:15.015521334 +0200
@@ -11,7 +11,6 @@ from vdirsyncer.vobject import Item

25
python-vdirsyncer-shift-deadline.patch Normal file
View File

@@ -0,0 +1,25 @@
Index: vdirsyncer-0.16.7/tests/system/cli/test_sync.py
===================================================================
--- vdirsyncer-0.16.7.orig/tests/system/cli/test_sync.py 2018-07-19 21:07:31.000000000 +0200
+++ vdirsyncer-0.16.7/tests/system/cli/test_sync.py 2019-05-07 08:59:40.114934546 +0200
@@ -5,11 +5,10 @@ import sys
from textwrap import dedent
import hypothesis.strategies as st
-from hypothesis import example, given
+from hypothesis import example, given, settings
import pytest
-
def test_simple_run(tmpdir, runner):
runner.write_with_general(dedent('''
[pair my_pair]
@@ -273,6 +272,7 @@ def test_multiple_pairs(tmpdir, runner):
# XXX: https://github.com/pimutils/vdirsyncer/issues/617
@pytest.mark.skipif(sys.platform == 'darwin',
reason='This test inexplicably fails')
+@settings(deadline=1000.0)
@given(collections=st.sets(
st.text(
st.characters(

7
python-vdirsyncer.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 7 05:47:52 UTC 2019 - pgajdos@suse.com
- added patches
default deadline (200ms) is too short for obs
+ python-vdirsyncer-shift-deadline.patch
-------------------------------------------------------------------
Mon May 6 13:36:29 UTC 2019 - pgajdos@suse.com

6
python-vdirsyncer.spec
View File

@@ -31,6 +31,8 @@ Source2: vdirsyncer.timer
# https://github.com/pimutils/vdirsyncer/pull/779
# https://github.com/pimutils/vdirsyncer/issues/793
Patch0: python-vdirsyncer-fix-tests.patch
# default deadline (200ms) is too short for obs
Patch1: python-vdirsyncer-shift-deadline.patch
BuildRequires: %{python_module setuptools_scm}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -74,6 +76,7 @@ what OfflineIMAP is for IMAP.
%prep
%setup -q -n vdirsyncer-%{version}
%patch0 -p1
%patch1 -p1
rm -rf vdirsyncer.egg-info
%build
@@ -88,7 +91,8 @@ install -Dpm 0644 %{SOURCE0} %{buildroot}%{_userunitdir}/vdirsyncer.service
install -Dpm 0644 %{SOURCE1} %{buildroot}%{_userunitdir}/vdirsyncer.timer
%check
%python_exec -m pytest -k 'not test_open_graphical_browser'
export DETERMINISTIC_TESTS=true
%pytest -k 'not test_open_graphical_browser'
%files %{python_files}
%doc README.rst