Accepting request 701106 from home:pgajdos

please really carefully review

OBS-URL: https://build.opensuse.org/request/show/701106
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-vdirsyncer?expand=0&rev=11

python-vdirsyncer-fix-tests.patch

@@ -1,16 +1,49 @@
-diff --git a/tests/conftest.py b/tests/conftest.py
+Index: vdirsyncer-0.16.7/tests/conftest.py
-index ff774ce1..6272d42d 100644
+===================================================================
---- a/tests/conftest.py
+--- vdirsyncer-0.16.7.orig/tests/conftest.py	2018-02-16 19:48:40.000000000 +0100
-+++ b/tests/conftest.py
++++ vdirsyncer-0.16.7/tests/conftest.py	2019-05-06 15:24:28.233806166 +0200
-@@ -27,7 +27,10 @@ def benchmark():
+@@ -7,7 +7,7 @@ import os
+ 
+ import click_log
+ 
+-from hypothesis import HealthCheck, Verbosity, settings
++from hypothesis import Verbosity, settings
+ 
+ import pytest
+ 
+@@ -27,15 +27,12 @@ else:
      del pytest_benchmark
  
  
 -settings.suppress_health_check = [HealthCheck.too_slow]
-+settings.register_profile("dev", settings(
+-
-+    suppress_health_check=[HealthCheck.too_slow]
-+))
-+settings.load_profile("dev")
- 
  settings.register_profile("ci", settings(
      max_examples=1000,
+     verbosity=Verbosity.verbose,
+ ))
+ settings.register_profile("deterministic", settings(
+     derandomize=True,
+-    perform_health_check=False
+ ))
+ 
+ if os.environ.get('DETERMINISTIC_TESTS', 'false').lower() == 'true':
+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
+@@ -11,7 +11,6 @@ from vdirsyncer.vobject import Item
+ 
+ 
+ @given(uid=uid_strategy)
+-@settings(perform_health_check=False)  # Using the random module for UIDs
+ def test_repair_uids(uid):
+     s = MemoryStorage()
+     s.items = {
+@@ -35,7 +34,6 @@ def test_repair_uids(uid):
+ 
+ 
+ @given(uid=uid_strategy.filter(lambda x: not href_safe(x)))
+-@settings(perform_health_check=False)  # Using the random module for UIDs
+ def test_repair_unsafe_uids(uid):
+     s = MemoryStorage()
+     item = Item(u'BEGIN:VCARD\nUID:{}\nEND:VCARD'.format(uid))

python-vdirsyncer.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May  6 13:36:29 UTC 2019 - pgajdos@suse.com
+
+- fix tests again https://github.com/pimutils/vdirsyncer/issues/793
+- modified patches
+  % python-vdirsyncer-fix-tests.patch (extended)
+
 -------------------------------------------------------------------
 Sat Apr  6 22:18:22 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

python-vdirsyncer.spec

@@ -29,6 +29,7 @@ Source0:        https://files.pythonhosted.org/packages/source/v/vdirsyncer/vdir
 Source1:        vdirsyncer.service
 Source2:        vdirsyncer.timer
 # https://github.com/pimutils/vdirsyncer/pull/779
+# https://github.com/pimutils/vdirsyncer/issues/793
 Patch0:         python-vdirsyncer-fix-tests.patch
 BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  fdupes