update patches for test phase

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

4 files changed, 142 insertions, 10 deletions

diff --git a/dev-python/dugong/ChangeLog b/dev-python/dugong/ChangeLog
index 6cb063ae0fe8..0077f3233cd1 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.7 2014/08/18 06:36:50 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dugong/ChangeLog,v 1.8 2014/08/20 07:57:24 idella4 Exp $
+
+  20 Aug 2014; Ian Delaney <idella4@gentoo.org> +files/3.3-test-timeout.patch,
+  dugong-3.3.ebuild:
+  update patches for test phase
 
 *dugong-3.3 (18 Aug 2014)
 
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
index f540b4a0353a..be7ee43eb884 100644
--- a/dev-python/dugong/Manifest
+++ b/dev-python/dugong/Manifest
@@ -4,6 +4,7 @@ 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
+AUX 3.3-test-timeout.patch 4101 SHA256 3e2b541e1c0b69d1ebc7e0bbfed15bb06be883eccb3dcd92ec7d700eba7552a0 SHA512 76894625751422ec3f09bb19ecf63540fc8c6573196225b062446adc0792d37030513fd34aa08e75be61996fbf446e987afd0d332ec52e2e6d7268bf9c4f5bec WHIRLPOOL 472432fc8df9d496136275a7ea89c29aed23953456650a1ca10c145ba5edbbeda8ba05ba09b627df8fad834eb5bde9d84a78a4d382e08bf7c46ad75e323acd27
 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
@@ -13,13 +14,13 @@ EBUILD dugong-2.2.ebuild 849 SHA256 6486aad1e428ca900c62f5bf40ef71f2bf4e56425534
 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 1096 SHA256 bd3e46e179ae98254b0ae40c93253f22427e310394a21dc4ffdd9d2c405ba445 SHA512 884e9879fd8df8aaf04dad449b5123f269631ad7b2774d17370652ac6790675b56c97815d76bbce712f664a2196adec66cf01e8d31371682f5240de82a76ffd9 WHIRLPOOL 5e988d3a261fd746764fd221f85b5c7c10917bcf69b2078130568dfa8c618f3e5b091d7e4fef56797db1b9d4f53c83b962ae33800f13fe7602f15d6245021819
-EBUILD dugong-3.3.ebuild 1090 SHA256 24c70e9b5313560029d8076fc64263ca56534572fb9a5415be60e319c5d8ef68 SHA512 28b7a6997cd9d1c2e929554260718bf5f62975f42aa65d1477c4f6cfaaa13d2ddc1184bc6295c26825bacddb6eadc85d4d8852a7b568694e0f651817a4e4f73b WHIRLPOOL 39f581e10cbd30814c0e538c0aee3e6f03da45bac9206c29fd467171daff52d7e314f42a1076144a203fadf5360f29ce99f02fd302133b078b00963520e8e19b
-MISC ChangeLog 1094 SHA256 d797b08618b6b2a78cb8722731b346e2cedbdada393e36106899e63b5b9d95f2 SHA512 78e3df76dca6be68b50b195b256f49da00e39f4327ecda8278dd066089208eb2ff5138ddb856ccfa408e9faf806136e221e8a5c398796c8614a8ebaa49eecb1a WHIRLPOOL 2ab6ab850af2cad2799c2ca581d8461c6cc7a79833b7ae5f3a07ba8d76720909fea0847a53bbbd3302e83a2eca102b7ccca05a1074a6dc9ff6a4f3c14aa76957
+EBUILD dugong-3.3.ebuild 1055 SHA256 b01fcd38a4226e309ae1b7cdda560f0114dd62779f2adadf447d3c95f05600f9 SHA512 d3caf83b6a131b0201596ffcaf3c2709b0b2341ff701d8960b91dd72462ccdb3dd4cc398388c713340834b8fd6ddc6e530b45be57e8840b0daaf3bc6639f6e96 WHIRLPOOL bd8c53ff8a2d495c323405c9a46d2047fddf626f38c2c2d26e29e806beaf00eebc4abac15dbe5e8e2ec31d2682ac1e20915da12817dabf1e7e648b294110c756
+MISC ChangeLog 1227 SHA256 3ea0f79f9bb07b6b9c89b9e16d6f9cfcef3e447433a39dec85d6df0ab670646c SHA512 e257098a5f6b0a09d87985237171e2942e94a359161c4fdb23d21fbbdbc5de2256cde209fb97beaf3899729917b203419e31a21f0d741430fa6b1f3cd6a4fb9b WHIRLPOOL c0e5570805b7159cf055bfc036fc94c4dd0ad385c671969effd4f1847df6a82880964e97092d9ff927b25cb905836b9a59a662cc3fe8c4e298ebe893abd9e5d7
 MISC metadata.xml 322 SHA256 b4074eae59ba9f705c42bd468ded8485de36c6382a63b91f17bdb9d733d2133c SHA512 458aff916cd06f05ad27e523dbf34bd61c1e7f7ea74d0c3ae51e39d651aefb43efa932b75515446398567d1cf7681bb3bb89596e37c6f957332c34e1e8a1e4d5 WHIRLPOOL 246f728c46f823bc7d8c2ddd7a91e32505713321402396a130038e722881b09874c23fa459c26c93ce3de060f5d4d27c3866ba3af8b53253e21b9b6d7cc50403
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlPxnO8ACgkQso7CE7gHKw11NgCgkkfZk8lI6bT+s6k44oEWkc4i
-wnsAni+6HbrLzKY6Fwq5GbjluysMpN4h
-=16El
+iEYEAREIAAYFAlP0UssACgkQso7CE7gHKw3UvQCePXgMtwQAzzjojELnSPH33btf
+v78AnRyc51pD4n3xHIcbbKC7FlU7iZfd
+=pGNH
 -----END PGP SIGNATURE-----
diff --git a/dev-python/dugong/dugong-3.3.ebuild b/dev-python/dugong/dugong-3.3.ebuild
index 04185e63c1bd..0c526e18e9c0 100644
--- a/dev-python/dugong/dugong-3.3.ebuild
+++ b/dev-python/dugong/dugong-3.3.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.3.ebuild,v 1.1 2014/08/18 06:36:50 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dugong/dugong-3.3.ebuild,v 1.2 2014/08/20 07:57:24 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python3_{3,4} )
@@ -19,9 +19,8 @@ IUSE="doc examples test"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/3.2-extract_links.patch
-		"${FILESDIR}"/3.2-timeout.patch
-		"${FILESDIR}"/3.2-aborted_write.patch )
+PATCHES=( "${FILESDIR}"/3.3-test-timeout.patch
+		"${FILESDIR}"/3.2-extract_links.patch )
 
 python_test() {
 	# https://bitbucket.org/nikratio/python-dugong/issue/12
diff --git a/dev-python/dugong/files/3.3-test-timeout.patch b/dev-python/dugong/files/3.3-test-timeout.patch
new file mode 100644
index 000000000000..afd391207976
--- /dev/null
+++ b/dev-python/dugong/files/3.3-test-timeout.patch
@@ -0,0 +1,128 @@
+https://bitbucket.org/nikratio/python-dugong/commits/0e9d67700bc8
+diff --git a/test/test_dugong.py b/test/test_dugong.py
+--- a/test/test_dugong.py
++++ b/test/test_dugong.py
+@@ -99,6 +99,12 @@
+     request.addfinalizer(conn.disconnect)
+     return conn
+ 
++@pytest.fixture()
++def random_fh(request):
++    fh = open('/dev/urandom', 'rb')
++    request.addfinalizer(fh.close)
++    return fh
++
+ def check_http_connection():
+     '''Skip test if we can't connect to ssl test server'''
+ 
+@@ -170,12 +176,12 @@
+     conn.get_ssl_cipher()
+     conn.get_ssl_peercert()
+ 
+-def test_blocking_send(conn):
++def test_blocking_send(conn, random_fh):
+     # Send requests until we block because all TCP buffers are full
+ 
+-    path = '/send_100_1200-byte_chunks'
++    path = '/send_102400_random_bytes'
+     for count in itertools.count():
+-        crt = conn.co_send_request('GET', path, body=DUMMY_DATA[:8192])
++        crt = conn.co_send_request('GET', path, body=random_fh.read(8192))
+         flag = False
+         for io_req in crt:
+             if not io_req.poll(1):
+@@ -539,7 +545,7 @@
+     conn.read_response()
+     conn.readall()
+ 
+-def test_aborted_write1(conn, monkeypatch):
++def test_aborted_write1(conn, monkeypatch, random_fh):
+     BUFSIZE = 64*1024
+ 
+     # Monkeypatch request handler
+@@ -562,14 +568,14 @@
+     # Try to write data
+     with pytest.raises(ConnectionClosed):
+         for _ in range(50):
+-            conn.write(b'f' * BUFSIZE)
++            conn.write(random_fh.read(BUFSIZE))
+ 
+     # Nevertheless, try to read response
+     resp = conn.read_response()
+     assert resp.status == 401
+     assert resp.reason == 'Please stop!'
+ 
+-def test_aborted_write2(conn, monkeypatch):
++def test_aborted_write2(conn, monkeypatch, random_fh):
+     BUFSIZE = 64*1024
+ 
+     # Monkeypatch request handler
+@@ -590,7 +596,7 @@
+     # Try to write data
+     with pytest.raises(ConnectionClosed):
+         for _ in range(50):
+-            conn.write(b'f' * BUFSIZE)
++            conn.write(random_fh.read(BUFSIZE))
+ 
+     # Nevertheless, try to read response
+     assert_raises(ConnectionClosed, conn.read_response)
+@@ -716,12 +722,13 @@
+     assert conn.read(50) == b'x' * 25
+     assert_raises(dugong.ConnectionTimedOut, conn.read, 50)
+ 
+-def test_send_timeout(conn, monkeypatch):
++def test_send_timeout(conn, monkeypatch, random_fh):
+     conn.timeout = 1
+ 
+     def do_PUT(self):
+         # Read just a tiny bit
+         self.rfile.read(256)
++        time.sleep(2*conn.timeout)
+     monkeypatch.setattr(MockRequestHandler, 'do_PUT', do_PUT)
+ 
+     # We don't know how much data can be buffered, so we
+@@ -730,7 +737,7 @@
+     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(random_fh.read(min(len_, 16*1024)))
+ 
+ 
+ DUMMY_DATA = ','.join(str(x) for x in range(10000)).encode()
+@@ -743,6 +750,14 @@
+     def log_message(self, format, *args):
+         pass
+ 
++    def setup(self):
++        super().setup()
++        self.random_fh = open('/dev/urandom', 'rb')
++
++    def finish(self):
++        super().finish()
++        self.random_fh.close()
++        
+     def handle_expect_100(self):
+         if self.handle_errors():
+             return
+@@ -782,14 +797,17 @@
+             self.wfile.close()
+             return
+ 
+-        hit = re.match(r'^/send_([0-9]+)_bytes', self.path)
++        hit = re.match(r'^/send_([0-9]+)_(random_)?bytes', self.path)
+         if hit:
+             len_ = int(hit.group(1))
+             self.send_response(200)
+             self.send_header("Content-Type", 'application/octet-stream')
+             self.send_header("Content-Length", str(len_))
+             self.end_headers()
+-            self.wfile.write(DUMMY_DATA[:len_])
++            if hit.group(2):
++                self.wfile.write(self.random_fh.read(len_))
++            else:
++                self.wfile.write(DUMMY_DATA[:len_])
+             return
+ 
+         hit = re.match(r'^/send_([0-9]+)_([0-9]+)-byte_chunks(?:_delay_([0-9]+)_ms)?',
+