add patches to fix testsuite

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

6 files changed, 108 insertions, 8 deletions

diff --git a/dev-python/dugong/ChangeLog b/dev-python/dugong/ChangeLog
index 902d33addc58..fbae0a56c80c 100644
--- a/dev-python/dugong/ChangeLog
+++ b/dev-python/dugong/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/dugong
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dugong/ChangeLog,v 1.5 2014/08/11 04:58:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dugong/ChangeLog,v 1.6 2014/08/12 14:06:27 idella4 Exp $
+
+  12 Aug 2014; Ian Delaney <idella4@gentoo.org> +files/3.2-aborted_write.patch,
+  +files/3.2-extract_links.patch, +files/3.2-timeout.patch, dugong-3.2.ebuild:
+  add patches to fix testsuite
 
   11 Aug 2014; Ian Delaney <idella4@gentoo.org> dugong-3.2.ebuild:
   update test phase
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
index 008ef12d5c3a..2eeae74667fa 100644
--- a/dev-python/dugong/Manifest
+++ b/dev-python/dugong/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 3.2-aborted_write.patch 1226 SHA256 b5418d592128151ad23370fd832cf23ca3ae2757cd488e20775846e52b8dcbf6 SHA512 a9d381bfd9a08377d13563c4b5e85406cafcccfefee0b12725f4fba661d8b8a2cc8617067868fcf74e639d9afa2ae52db0ef07776f6d8afb8d92a37665328703 WHIRLPOOL f62c0adcf88bb7d67869bf7af6f55860b077c8b21c55a91c4e84a66283562e29946dc43e95a8d456c0a15c3dd40c0d66927de473f4de01ff24278cd68d5aa720
+AUX 3.2-extract_links.patch 790 SHA256 9548472a93965d0076b9bb68a4c08650769f785694bd5b34863432db252f0846 SHA512 6595f605616e04c34a98cd49a5a23471fc43a936745d7f33f19691dc157874d5b2c998264e2aa585f7f7e4aabaa1eec23289f07ee15edf9ccf7b8ba438c058de WHIRLPOOL 7f597c1f70ffdb34c9b5c812fa6616054efa33bed7663ac8d27ef88f1d2ced407e938f4395d2b5190c8144d20df5dd1f3bc32a842691abcc686041f06c0f71a7
+AUX 3.2-timeout.patch 698 SHA256 bfff9cfee9a6d94aa786826b23930282607a7c897eeefe11035fbd1c048e1db4 SHA512 725edfc81e4fbf6326846d7df6e98b65fd8073db6cdef08e7e53ae542451af24487d08bf163c31206911495b78767d2ee3d277876d2da1444d634aafebf48fcd WHIRLPOOL ad52e1469c3a3f97906f4ce0a9013ecf4d2964d0219f8f07df18c7520abb628a74782cb10989779e7f964ec6783983037ba6c25ed82bce18a0003a0125634e03
 DIST dugong-2.2.tar.bz2 178453 SHA256 4dff77cfb23a571e4bbc123e39141437668a4a561771471b0f0e0ea3230e12df SHA512 5c421c2c9d8cd9115face411a3317fd1d6b10e7a955895d3d50eadb9258892076875d879b3631709135bcdb972416fbe7549843bd9ac76377d9a6203686d8807 WHIRLPOOL 11122cddcf069463b51d1a31579808a1b4f4e95b9068b43cfa90e82dc82c19e55d7d3f0790fb8b957cbf92af9ac071aeae4354785432266e29b7496136696c12
 DIST dugong-3.0.tar.bz2 180654 SHA256 7bcf0179a033cf60e6de687bd71554ddeb3d96fe38ee3ff94fe5786dd6f59cb5 SHA512 adaeb52f91805bff37addf4fa80c5c97b3bc093bc0c85ecb2ed365c10cf0423c38ce4d719cf5c6659181c6804456a622b19f5a50d6c585109ced0a4f072b62d4 WHIRLPOOL aa123156c2c5792554e18df46ee19065805231631d049c13181564be259e3cedb704ba401c6038a1e603df535f989dc797b84143f6289245ce550e1b8f27b056
 DIST dugong-3.1.tar.bz2 180628 SHA256 97153fb6d734fe29fa20dab8f5918bb36ebf5313273ecdb36d44db0e78aae537 SHA512 2bed91dfedde57e05b5c4b7a21057f640af18aa1eb7d368ddab4b88d10f350c8ffd8f2ff1550344b824bf70edefba38b83fec94fa163ccc817da2a59248dc87a WHIRLPOOL eb8687df9a24f9e011f4245877ba8e7b988ff51246689e3a29bfadd791cc5ca1cb3e3be46c9ffdc8b0b9c94a73c42d60013157fac292a70a04cbf9b72bf05144
@@ -8,13 +11,13 @@ DIST dugong-3.2.tar.bz2 182531 SHA256 a9413f1a8d89b927e0c39646dceb1e1987b3f550da
 EBUILD dugong-2.2.ebuild 849 SHA256 6486aad1e428ca900c62f5bf40ef71f2bf4e5642553463778b8e23501ceeb618 SHA512 bb5763c8eb9f4bddd24102c47f971cabd3f81ab06d570d560b6464285b73821d0a535814aa666bd00d7b55fa56cceeec8a53d0ae5833a02da59a3ef7b197a93d WHIRLPOOL 4d692db2f38c157ccd4d0847019f9409b5e788dbf6cfddbb0292f3c9495f3027a545229f4d857f1adbc9dbed539b09a1abca83d9176086412e8d27a2567e81b3
 EBUILD dugong-3.0.ebuild 853 SHA256 e50f6da06b277b13e716600f2827680e151a2248da980fa0e01fe5fd83225e01 SHA512 a428a6634cec10dbf7b321534de35fc1b8d0c85cec1d5a1c312b39fad8b6cb50c60e28502f358e2709c58cdafd62a8db23be11fc20a86e3d3d2a2cdbfebc32ea WHIRLPOOL aa71ca9a28775bdd09d5f8a010d1986d45e92604bf48b0ce4a1f5677ec3c5a0f16371c010c0615e1a7744d297e15d4ad6af95a208fe37bffc01ff279e6c45143
 EBUILD dugong-3.1.ebuild 935 SHA256 66d2f28a8035e9af760a390d801d2ffa3dfddf89dcce1d5f93974a09872f4e73 SHA512 c119bf773f3c3afb0253ab087b0d520f057fd9748ce273f474ebfdf268b3deb24d8b1b9bade59b2794ab9ec685c47998f8c61c794601c8e878da87e63e954fc1 WHIRLPOOL 8e39aaaf9b8988704620275c8c512f1853f398fb8d04ea81272e3e40eb0f08216f7631525822dc9991b07c53c85c7d1825966f6b755f2c8f50d3486ad3d2d121
-EBUILD dugong-3.2.ebuild 1028 SHA256 993d517828557a4bfc43f226bb23ad105f3ae7e0e294c44625413834d8367512 SHA512 0c5baa6f50a3f882006f860f281dd78cd0490856c8895d395a75503e7445df184760c986f3690a7a849a8e88c02052feac3b88abf0182c44b595d395ea2fe325 WHIRLPOOL 37d183292a103155422d88e0dbe7a095fc73cd7fc32634bcb925ccbd0518065a384556444834fc295ca8f21a39ea0a340a41e7d5299430a25e7edb2a799efe4b
-MISC ChangeLog 800 SHA256 d1fdf1873b4ac8af326e9177e23af0af3a6b7369ce17e3e5a5cae69f51e1cb24 SHA512 63bad6b84ab4be8684cdfd7f15c64a595077ca954d4f4347989f0716429322d341d0214b263f3b2ec734c84ee73f905ecc5e318540b8cab79cc4535bd6361767 WHIRLPOOL 0f182333a5b68e2a998eb4adad48d7394585fd43b3307dbaf830505f342fd6a08a997b4f7a34750f55d0d70e719a0290392c624bc81c01a6c90ac949d66c1e95
+EBUILD dugong-3.2.ebuild 1096 SHA256 bd3e46e179ae98254b0ae40c93253f22427e310394a21dc4ffdd9d2c405ba445 SHA512 884e9879fd8df8aaf04dad449b5123f269631ad7b2774d17370652ac6790675b56c97815d76bbce712f664a2196adec66cf01e8d31371682f5240de82a76ffd9 WHIRLPOOL 5e988d3a261fd746764fd221f85b5c7c10917bcf69b2078130568dfa8c618f3e5b091d7e4fef56797db1b9d4f53c83b962ae33800f13fe7602f15d6245021819
+MISC ChangeLog 991 SHA256 e013870865129c9291d43a6c8f587c2c145d1908fae6d114926c8b43e8a8e84d SHA512 cba4729b382232c6a3196f4cce2d87ea94240adbdd5bc242ff133da19ab02cf503816036c29af0f755ba5b7a529b64a56a7a6f41f8fa2bf5c93966865fff4896 WHIRLPOOL 6d9bae4eb6837a99479a2e9480845de3956f1d94ebae673f3dfd5e95dc0101eb877447bb0fcdcb0b34c86cb21bd40cd54fc3105f88f06bcacdc3d28d875feb61
 MISC metadata.xml 322 SHA256 b4074eae59ba9f705c42bd468ded8485de36c6382a63b91f17bdb9d733d2133c SHA512 458aff916cd06f05ad27e523dbf34bd61c1e7f7ea74d0c3ae51e39d651aefb43efa932b75515446398567d1cf7681bb3bb89596e37c6f957332c34e1e8a1e4d5 WHIRLPOOL 246f728c46f823bc7d8c2ddd7a91e32505713321402396a130038e722881b09874c23fa459c26c93ce3de060f5d4d27c3866ba3af8b53253e21b9b6d7cc50403
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlPoS2QACgkQso7CE7gHKw3ZrwCgvxJI/CwgN9tfZU/QWMy2BWr5
-TIMAnRMe1MEjzfP5LhSU6DIcDvjCNYZ5
-=b/Ry
+iEYEAREIAAYFAlPqHVIACgkQso7CE7gHKw00EgCdFv7ZyeDUJmiY195XO2Ry4X2F
+t50AoJngRJRazbp/ldsaeqVsPkpHOUFY
+=CYHM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/dugong/dugong-3.2.ebuild b/dev-python/dugong/dugong-3.2.ebuild
index 76318e6abd5a..033582e9f862 100644
--- a/dev-python/dugong/dugong-3.2.ebuild
+++ b/dev-python/dugong/dugong-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dugong/dugong-3.2.ebuild,v 1.2 2014/08/11 04:58:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dugong/dugong-3.2.ebuild,v 1.3 2014/08/12 14:06:27 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python3_{3,4} )
@@ -19,10 +19,13 @@ IUSE="doc examples test"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
+PATCHES=( "${FILESDIR}"/${PV}-extract_links.patch
+		"${FILESDIR}"/${PV}-timeout.patch
+		"${FILESDIR}"/${PV}-aborted_write.patch )
+
 python_test() {
 	# https://bitbucket.org/nikratio/python-dugong/issue/12
 	einfo "Test suite can take several minutes to complete"
-	# https://bitbucket.org/nikratio/python-dugong/issue/13 14 15
 	py.test -v || die "Tests failed under ${EPYTHON}"
 }
 
diff --git a/dev-python/dugong/files/3.2-aborted_write.patch b/dev-python/dugong/files/3.2-aborted_write.patch
new file mode 100644
index 000000000000..bf25a3772e15
--- /dev/null
+++ b/dev-python/dugong/files/3.2-aborted_write.patch
@@ -0,0 +1,45 @@
+https://bitbucket.org/nikratio/python-dugong/issue/13/test_aborted_write-failures-in-latest
+diff --git a/test/test_dugong.py b/test/test_dugong.py
+--- a/test/test_dugong.py
++++ b/test/test_dugong.py
+@@ -540,7 +540,7 @@
+     conn.readall()
+ 
+ def test_aborted_write1(conn, monkeypatch):
+-    BUFSIZE = 64*1024
++    BUFSIZE = 640*1024
+ 
+     # Monkeypatch request handler
+     def do_PUT(self):
+@@ -561,8 +561,9 @@
+ 
+     # Try to write data
+     with pytest.raises(ConnectionClosed):
+-        for _ in range(50):
++        for _ in range(5000):
+             conn.write(b'f' * BUFSIZE)
++            time.sleep(0.1)
+ 
+     # Nevertheless, try to read response
+     resp = conn.read_response()
+@@ -570,7 +571,7 @@
+     assert resp.reason == 'Please stop!'
+ 
+ def test_aborted_write2(conn, monkeypatch):
+-    BUFSIZE = 64*1024
++    BUFSIZE = 640*1024
+ 
+     # Monkeypatch request handler
+     def do_PUT(self):
+@@ -589,8 +590,9 @@
+ 
+     # Try to write data
+     with pytest.raises(ConnectionClosed):
+-        for _ in range(50):
++        for _ in range(5000):
+             conn.write(b'f' * BUFSIZE)
++            time.sleep(0.1)
+ 
+     # Nevertheless, try to read response
+     assert_raises(ConnectionClosed, conn.read_response)
+
diff --git a/dev-python/dugong/files/3.2-extract_links.patch b/dev-python/dugong/files/3.2-extract_links.patch
new file mode 100644
index 000000000000..0e8d251bdd86
--- /dev/null
+++ b/dev-python/dugong/files/3.2-extract_links.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# User Nikolaus Rath <Nikolaus@rath.org>
+# Date 1407732767 25200
+# Node ID 1cfd473db8736251291e106ce6cd488011626276
+# Parent  cd7ad81f4eea24e530db152edd6d8831dc5bd7bc
+Make extract_links.py Python 3.3 compatible again.
+
+Fixes issue #15.
+
+diff --git a/examples/extract_links.py b/examples/extract_links.py
+--- a/examples/extract_links.py
++++ b/examples/extract_links.py
+@@ -30,7 +30,11 @@
+ 
+ class LinkExtractor(HTMLParser):
+     def __init__(self):
+-        super().__init__(convert_charrefs=True)
++        if sys.version_info < (3,4):
++            # Python 3.3 doesn't know about convert_charrefs
++            super().__init__()
++        else:
++            super().__init__(convert_charrefs=True)
+         self.links = []
+ 
+     def handle_starttag(self, tag, attrs):
+
diff --git a/dev-python/dugong/files/3.2-timeout.patch b/dev-python/dugong/files/3.2-timeout.patch
new file mode 100644
index 000000000000..5ee43f7367c7
--- /dev/null
+++ b/dev-python/dugong/files/3.2-timeout.patch
@@ -0,0 +1,19 @@
+https://bitbucket.org/nikratio/python-dugong/issue/14/test_send_timeout-ssl-failure-in-latest
+diff --git a/test/test_dugong.py b/test/test_dugong.py
+--- a/test/test_dugong.py
++++ b/test/test_dugong.py
+@@ -726,11 +728,11 @@
+ 
+     # We don't know how much data can be buffered, so we
+     # claim to send a lot and do so in a loop.
+-    len_ = 1024**3
++    len_ = 10 * 1024**3
+     conn.send_request('PUT', '/recv_something', body=BodyFollowing(len_))
+     with pytest.raises(dugong.ConnectionTimedOut):
+         while len_ > 0:
+-            conn.write(b'x' * min(len_, 16*1024))
++            conn.write(b'x' * min(len_, 640*1024))
+ 
+ 
+ DUMMY_DATA = ','.join(str(x) for x in range(10000)).encode()
+