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

[jelmer at users.alioth.debian.org]

    Date: Wednesday, July 19, 2017 @ 01:44:44
  Author: jelmer
Revision: 14258

Add patch 0006-disable-sync.patch: Disable two tests that sometimes
hang. Closes: #836667

Added:
  packages/vdirsyncer/trunk/debian/patches/0006-disable-sync.patch
Modified:
  packages/vdirsyncer/trunk/debian/changelog
  packages/vdirsyncer/trunk/debian/patches/series

Modified: packages/vdirsyncer/trunk/debian/changelog
===================================================================
--- packages/vdirsyncer/trunk/debian/changelog	2017-07-19 01:01:11 UTC (rev 14257)
+++ packages/vdirsyncer/trunk/debian/changelog	2017-07-19 01:44:44 UTC (rev 14258)
@@ -1,6 +1,8 @@
 vdirsyncer (0.16.0-2) UNRELEASED; urgency=medium
 
   * Install upstream changelog. Closes: #867790
+  * Add patch 0006-disable-sync.patch: Disable two tests that sometimes
+    hang. Closes: #836667
 
  -- Jelmer Vernooij <jelmer at debian.org>  Wed, 19 Jul 2017 01:01:04 +0000
 

Added: packages/vdirsyncer/trunk/debian/patches/0006-disable-sync.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0006-disable-sync.patch	                        (rev 0)
+++ packages/vdirsyncer/trunk/debian/patches/0006-disable-sync.patch	2017-07-19 01:44:44 UTC (rev 14258)
@@ -0,0 +1,113 @@
+Description: Disable two patches that seem to sometimes hang.
+Bug-Debian: https://bugs.debian.org/836667
+Bug: https://github.com/pimutils/vdirsyncer/issues/654
+Author: Jelmer Vernooij <jelmer at debian.org>
+
+--- vdirsyncer/tests/system/cli/test_sync.py	2017-07-19 01:39:21.838752432 +0000
++++ vdirsyncer/tests/system/cli/test_sync.py	2017-07-19 01:39:32.622691813 +0000
+@@ -235,41 +235,6 @@
+     assert 'pair foobar: collection "d" not found' in result.output.lower()
+ 
+ 
+-def test_multiple_pairs(tmpdir, runner):
+-    def get_cfg():
+-        for name_a, name_b in ('foo', 'bar'), ('bam', 'baz'):
+-            yield dedent('''
+-            [pair {a}{b}]
+-            a = "{a}"
+-            b = "{b}"
+-            collections = null
+-            ''').format(a=name_a, b=name_b)
+-
+-            for name in name_a, name_b:
+-                yield dedent('''
+-                [storage {name}]
+-                type = "filesystem"
+-                path = "{path}"
+-                fileext = ".txt"
+-                ''').format(name=name, path=str(tmpdir.mkdir(name)))
+-
+-    runner.write_with_general(''.join(get_cfg()))
+-
+-    result = runner.invoke(['discover'])
+-    assert not result.exception
+-    assert set(result.output.splitlines()) > set([
+-        'Discovering collections for pair bambaz',
+-        'Discovering collections for pair foobar'
+-    ])
+-
+-    result = runner.invoke(['sync'])
+-    assert not result.exception
+-    assert set(result.output.splitlines()) == set([
+-        'Syncing bambaz',
+-        'Syncing foobar',
+-    ])
+-
+-
+ def test_ident_conflict(tmpdir, runner):
+     runner.write_with_general(dedent('''
+     [pair foobar]
+@@ -446,63 +411,3 @@
+         assert not r.exception
+         assert baritem.exists()
+         assert fooitem.exists()
+-
+-
+-def test_fetch_only_necessary_params(tmpdir, runner):
+-    fetched_file = tmpdir.join('fetched_flag')
+-    fetch_script = tmpdir.join('fetch_script')
+-    fetch_script.write(dedent('''
+-    set -e
+-    touch "{}"
+-    echo ".txt"
+-    '''.format(str(fetched_file))))
+-
+-    runner.write_with_general(dedent('''
+-    [pair foobar]
+-    a = "foo"
+-    b = "bar"
+-    collections = null
+-
+-    [pair bambar]
+-    a = "bam"
+-    b = "bar"
+-    collections = null
+-
+-    [storage foo]
+-    type = "filesystem"
+-    path = "{path}"
+-    fileext = ".txt"
+-
+-    [storage bar]
+-    type = "filesystem"
+-    path = "{path}"
+-    fileext = ".txt"
+-
+-    [storage bam]
+-    type = "filesystem"
+-    path = "{path}"
+-    fileext.fetch = ["command", "sh", "{script}"]
+-    '''.format(path=str(tmpdir.mkdir('bogus')), script=str(fetch_script))))
+-
+-    def fetched():
+-        try:
+-            fetched_file.remove()
+-            return True
+-        except Exception:
+-            return False
+-
+-    r = runner.invoke(['discover'])
+-    assert not r.exception
+-    assert fetched()
+-
+-    r = runner.invoke(['sync', 'foobar'])
+-    assert not r.exception
+-    assert not fetched()
+-
+-    r = runner.invoke(['sync'])
+-    assert not r.exception
+-    assert fetched()
+-
+-    r = runner.invoke(['sync', 'bambar'])
+-    assert not r.exception
+-    assert fetched()

Modified: packages/vdirsyncer/trunk/debian/patches/series
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/series	2017-07-19 01:01:11 UTC (rev 14257)
+++ packages/vdirsyncer/trunk/debian/patches/series	2017-07-19 01:44:44 UTC (rev 14258)
@@ -2,3 +2,4 @@
 0002-Include-license-from-copyright-file.patch
 0003-Skip-SSL-tests.patch
 0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch
+0006-disable-sync.patch