[Python-apps-commits] r14266 - in packages/vdirsyncer/trunk/debian (3 files)

jelmer at users.alioth.debian.org jelmer at users.alioth.debian.org
Thu Jul 20 00:51:47 UTC 2017 

    Date: Thursday, July 20, 2017 @ 00:51:46
  Author: jelmer
Revision: 14266

Update patch
0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch:
use enums rather tan strings to identify health checks to skip.
Should fix errors about slow data generation on ARM.

Added:
  packages/vdirsyncer/trunk/debian/patches/0007-healthcheck-too-slow.patch
Modified:
  packages/vdirsyncer/trunk/debian/changelog
  packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch

Modified: packages/vdirsyncer/trunk/debian/changelog
===================================================================
--- packages/vdirsyncer/trunk/debian/changelog	2017-07-19 13:18:27 UTC (rev 14265)
+++ packages/vdirsyncer/trunk/debian/changelog	2017-07-20 00:51:46 UTC (rev 14266)
@@ -1,3 +1,12 @@
+vdirsyncer (0.16.0-3) UNRELEASED; urgency=medium
+
+  * Update patch
+    0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch:
+    use enums rather tan strings to identify health checks to skip.
+    Should fix errors about slow data generation on ARM.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Thu, 20 Jul 2017 00:37:24 +0000
+
 vdirsyncer (0.16.0-2) unstable; urgency=medium
 
   * Install upstream changelog. Closes: #867790

Modified: packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch	2017-07-19 13:18:27 UTC (rev 14265)
+++ packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch	2017-07-20 00:51:46 UTC (rev 14266)
@@ -12,94 +12,95 @@
  tests/test_repair.py          | 4 ++--
  5 files changed, 10 insertions(+), 6 deletions(-)
 
-diff -ur vdirsyncer-0.16.0/tests/storage/__init__.py vdirsyncer-0.16.0-patched/tests/storage/__init__.py
---- vdirsyncer-0.16.0/tests/storage/__init__.py	2017-06-18 16:00:02.000000000 +0000
-+++ vdirsyncer-0.16.0-patched/tests/storage/__init__.py	2017-07-03 00:53:30.893700323 +0000
-@@ -7,7 +7,7 @@
+diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py
+index a66c008..4589fec 100644
+--- a/tests/storage/__init__.py
++++ b/tests/storage/__init__.py
+@@ -7,7 +7,7 @@ import textwrap
  from urllib.parse import quote as urlquote, unquote as urlunquote
  
  import hypothesis.strategies as st
 -from hypothesis import given
-+from hypothesis import given, settings
++from hypothesis import given, settings, HealthCheck
  
  import pytest
  
-@@ -301,6 +301,7 @@
+@@ -301,6 +301,7 @@ class StorageTests(object):
          st.none(),
          printable_characters_strategy.filter(lambda x: x.strip() != x)
      ))
-+    @settings(suppress_health_check=["HealthCheck.too_slow"])
++    @settings(suppress_health_check=[HealthCheck.too_slow])
      def test_metadata_normalization(self, requires_metadata, s, value):
          x = s.get_meta('displayname')
          assert x == normalize_meta_value(x)
-Only in vdirsyncer-0.16.0-patched/tests/storage: __init__.py.orig
-diff -ur vdirsyncer-0.16.0/tests/system/cli/test_discover.py vdirsyncer-0.16.0-patched/tests/system/cli/test_discover.py
---- vdirsyncer-0.16.0/tests/system/cli/test_discover.py	2017-02-24 17:22:44.000000000 +0000
-+++ vdirsyncer-0.16.0-patched/tests/system/cli/test_discover.py	2017-07-03 00:54:01.749520344 +0000
-@@ -2,7 +2,7 @@
+diff --git a/tests/system/cli/test_discover.py b/tests/system/cli/test_discover.py
+index 6355232..322822c 100644
+--- a/tests/system/cli/test_discover.py
++++ b/tests/system/cli/test_discover.py
+@@ -2,7 +2,7 @@ import json
  from textwrap import dedent
  
  import hypothesis.strategies as st
 -from hypothesis import given
-+from hypothesis import given, settings
++from hypothesis import given, settings, HealthCheck
  
  from vdirsyncer import exceptions
  from vdirsyncer.storage.base import Storage
-@@ -177,6 +177,7 @@
+@@ -177,6 +177,7 @@ def test_null_collection_with_named_collection(tmpdir, runner):
  
  
  @given(a_requires=st.booleans(), b_requires=st.booleans())
-+ at settings(suppress_health_check=["HealthCheck.too_slow"])
++ at settings(suppress_health_check=[HealthCheck.too_slow])
  def test_collection_required(a_requires, b_requires, tmpdir, runner,
                               monkeypatch):
  
-Only in vdirsyncer-0.16.0-patched/tests/system/cli: test_discover.py~
-diff -ur vdirsyncer-0.16.0/tests/system/cli/test_fetchparams.py vdirsyncer-0.16.0-patched/tests/system/cli/test_fetchparams.py
---- vdirsyncer-0.16.0/tests/system/cli/test_fetchparams.py	2017-02-24 17:22:44.000000000 +0000
-+++ vdirsyncer-0.16.0-patched/tests/system/cli/test_fetchparams.py	2017-07-03 00:53:30.893700323 +0000
+diff --git a/tests/system/cli/test_fetchparams.py b/tests/system/cli/test_fetchparams.py
+index 8c010ba..e3bbc0b 100644
+--- a/tests/system/cli/test_fetchparams.py
++++ b/tests/system/cli/test_fetchparams.py
 @@ -3,7 +3,7 @@
  from textwrap import dedent
  
  import hypothesis.strategies as st
 -from hypothesis import given
-+from hypothesis import given, settings
++from hypothesis import given, settings, HealthCheck
  
  import pytest
  
-@@ -89,6 +89,7 @@
+@@ -89,6 +89,7 @@ def test_key_conflict(monkeypatch, mystrategy):
      assert 'Can\'t set foo.fetch and foo.' in str(excinfo.value)
  
  
-+ at settings(suppress_health_check=["HealthCheck.too_slow"])
++ at settings(suppress_health_check=[HealthCheck.too_slow])
  @given(s=st.text(), t=st.text(min_size=1))
  def test_fuzzing(s, t, mystrategy):
      config = expand_fetch_params({
-Only in vdirsyncer-0.16.0-patched/tests/unit/cli: test_discover.py.orig
-diff -ur vdirsyncer-0.16.0/tests/unit/test_metasync.py vdirsyncer-0.16.0-patched/tests/unit/test_metasync.py
---- vdirsyncer-0.16.0/tests/unit/test_metasync.py	2017-06-18 16:00:02.000000000 +0000
-+++ vdirsyncer-0.16.0-patched/tests/unit/test_metasync.py	2017-07-03 00:53:30.893700323 +0000
+diff --git a/tests/unit/test_metasync.py b/tests/unit/test_metasync.py
+index 0b1ab95..3e50a13 100644
+--- a/tests/unit/test_metasync.py
++++ b/tests/unit/test_metasync.py
 @@ -1,7 +1,7 @@
  # -*- coding: utf-8 -*-
  
  import hypothesis.strategies as st
 -from hypothesis import example, given
-+from hypothesis import example, given, settings
++from hypothesis import example, given, settings, HealthCheck
  
  import pytest
  
-@@ -130,6 +130,7 @@
+@@ -125,6 +125,7 @@ values = st.text().filter(lambda x: normalize_meta_value(x) == x)
+ metadata = st.dictionaries(keys, values)
+ 
+ 
++ at settings(suppress_health_check=[HealthCheck.too_slow])
+ @given(
+     a=metadata, b=metadata,
      status=metadata, keys=st.sets(keys),
-     conflict_resolution=st.just('a wins') | st.just('b wins')
- )
-+ at settings(suppress_health_check=["HealthCheck.too_slow"])
- @example(a={u'0': u'0'}, b={}, status={u'0': u'0'}, keys={u'0'},
-          conflict_resolution='a wins')
- @example(a={'0': '0'}, b={'0': '1'}, status={'0': '0'}, keys={'0'},
-Only in vdirsyncer-0.16.0-patched/tests/unit: test_metasync.py.orig
-diff -ur vdirsyncer-0.16.0/tests/unit/test_repair.py vdirsyncer-0.16.0-patched/tests/unit/test_repair.py
---- vdirsyncer-0.16.0/tests/unit/test_repair.py	2017-04-15 16:02:12.000000000 +0000
-+++ vdirsyncer-0.16.0-patched/tests/unit/test_repair.py	2017-07-03 00:53:30.893700323 +0000
-@@ -11,7 +11,7 @@
+diff --git a/tests/unit/test_repair.py b/tests/unit/test_repair.py
+index 0ba726e..8b9df59 100644
+--- a/tests/unit/test_repair.py
++++ b/tests/unit/test_repair.py
+@@ -11,7 +11,7 @@ from vdirsyncer.vobject import Item
  
  
  @given(uid=uid_strategy)
@@ -108,7 +109,7 @@
  def test_repair_uids(uid):
      s = MemoryStorage()
      s.items = {
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,7 @@ def test_repair_uids(uid):
  
  
  @given(uid=uid_strategy.filter(lambda x: not href_safe(x)))

Added: packages/vdirsyncer/trunk/debian/patches/0007-healthcheck-too-slow.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0007-healthcheck-too-slow.patch	                        (rev 0)
+++ packages/vdirsyncer/trunk/debian/patches/0007-healthcheck-too-slow.patch	2017-07-20 00:51:46 UTC (rev 14266)
@@ -0,0 +1,24 @@
+Description: Disable health check warning in hypothesis; this triggers woith test_fuzzing on some ARM machines
+Author: Jelmer Vernooij <jelmer at debian.org>
+
+diff --git a/tests/unit/test_metasync.py b/tests/unit/test_metasync.py
+index 0b1ab95..809d679 100644
+--- a/tests/unit/test_metasync.py
++++ b/tests/unit/test_metasync.py
+@@ -1,7 +1,7 @@
+ # -*- coding: utf-8 -*-
+ 
+ import hypothesis.strategies as st
+-from hypothesis import example, given
++from hypothesis import example, given, settings
+ 
+ import pytest
+ 
+@@ -125,6 +125,7 @@ values = st.text().filter(lambda x: normalize_meta_value(x) == x)
+ metadata = st.dictionaries(keys, values)
+ 
+ 
++ at settings(suppress_health_check=['HealthCheck.too_slow'])
+ @given(
+     a=metadata, b=metadata,
+     status=metadata, keys=st.sets(keys),

More information about the Python-apps-commits mailing list