From c6abff644db2c4a2fce989be90f7c44bc0c3abe8 Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Sat, 17 Jan 2015 07:07:43 +0000 Subject: [PATCH] remove disused patch Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- dev-python/testify/ChangeLog | 6 +++- dev-python/testify/Manifest | 9 +++--- .../testify/files/testify-0.2.6-tests.patch | 29 ------------------- 3 files changed, 9 insertions(+), 35 deletions(-) delete mode 100644 dev-python/testify/files/testify-0.2.6-tests.patch diff --git a/dev-python/testify/ChangeLog b/dev-python/testify/ChangeLog index d443033278ea..aa9dfa899b57 100644 --- a/dev-python/testify/ChangeLog +++ b/dev-python/testify/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/testify # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/ChangeLog,v 1.19 2015/01/17 07:03:15 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/ChangeLog,v 1.20 2015/01/17 07:07:20 idella4 Exp $ + + 17 Jan 2015; Ian Delaney + -files/testify-0.2.6-tests.patch: + remove disused patch *testify-0.5.7 (17 Jan 2015) diff --git a/dev-python/testify/Manifest b/dev-python/testify/Manifest index 75d500cc64ef..7a310661dcc5 100644 --- a/dev-python/testify/Manifest +++ b/dev-python/testify/Manifest @@ -1,15 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX testify-0.2.6-tests.patch 929 SHA256 e32c2063efcff255031afa35f62f2156e2710226c68d673325dd4cf7eb51ee80 SHA512 103340679a434fa27db895270133e0da85e6dd4d2dcaba6efe4c4ab9bc18e88c790f94c05236b4e5671a7262bac637870717f8ec0ccdd1a1afef871e09b7714d WHIRLPOOL 2cb001750087034e082a746884fadd8233022437247f84f4b3da396a654ac28b61d9f33cb65be8d6757d44350223b7c0eb56f6761f239fc83f84b5540b447909 DIST testify-0.5.7.tar.gz 166954 SHA256 153796d3b20b2d8554e52af26a8c891e6f02dfd6cc7be29f9241dad244cff044 SHA512 410ac412306c11bba992b882624fcacdbff00e2865cd986c560d8b50ea8dff0ead8603b18f40414d8dbbe1f3ab9426e0f61170dc450927f6d2282e389800ff21 WHIRLPOOL 2cc958efea71bd475c698cee36e4f1bdb7197c8cb54c38efbf66927d5abc60e769a8995ae7fb4107fab8b74e4b05afcaf16e5c0aec9db3471ddbd771bafa3adf EBUILD testify-0.5.7.ebuild 1355 SHA256 adafb0ede8ee4d9eaa7dbae19fbeb69e653af975b9b1dec2aea3913c4abda7fc SHA512 07df2c06e109278e2c99c88d080ded618c7099d583fac32ea6b41179f4fb1817837f1212d6f54ad803eb895ef81a9e2d8213e549f7894ccd2a728e29fd42fe43 WHIRLPOOL d65eea1497ac46428c02d617b0bb4704df6b53e9ae57e9f8a881bd1ddec6618bd9b84701e7a3970bba4ac98befe37e257f2ae0423cecc47b912ed1b87cfcea46 -MISC ChangeLog 3030 SHA256 59ea95a26c85cfe4496585e8f5074e215e20b53c0e4a34ac39f77dcff9367e9a SHA512 0a1e6df84de99a3d5809d1ef6b44d247344624e80f15accb83a8824eb940e09b3aedaef9ba9c05163849d2a25932859454de073a3f1fd98e4d8a7d33e396cce2 WHIRLPOOL a0c0219bd45db7069b5237760eb058e15ff1ccf65af97f74f123327342b23190afb4b3fc2b8201a1fd0a025c720a18441167bcebe623118e19178766ffea5300 +MISC ChangeLog 3138 SHA256 5a6a022e360e713ba4df22f420ba2b908955aa00e591948693dcd448702ef842 SHA512 523c4a57f74d96f4e66f69b23471962ead68807f743c43e95e15921047969ea608fd222be75c075f9de788dbe167190829373c94d3254157ba9b7ffdc06d9ce1 WHIRLPOOL 2087d171f6de209eea40f420328fcc1bc089bc8e3e69be3e738a71fe9ec28e2fa377f04033dd7f10582b4fbb122dbc111d14d3c62feab191f84dfbb80248342b MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlS6CUEACgkQso7CE7gHKw1UmgCgrwnTKN5JoeTEEh4M1bwLMTon -jDcAn2uZ4Yl7uZJxfUTJDXqHDWr/7pFb -=SXNW +iEYEAREIAAYFAlS6CjUACgkQso7CE7gHKw3jMgCgj0zJFTYb5txvywLl50/3hBgz +VPAAnRZWRhYeOe9EpAy4whlQZxe2z3tL +=xPbJ -----END PGP SIGNATURE----- diff --git a/dev-python/testify/files/testify-0.2.6-tests.patch b/dev-python/testify/files/testify-0.2.6-tests.patch deleted file mode 100644 index fefb9b80d3db..000000000000 --- a/dev-python/testify/files/testify-0.2.6-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/blampe/Testify/commit/c1e159fe0e668a1ee56b0b1b2858c0a0becf20a0 -https://github.com/Yelp/Testify/issues/65 - ---- a/test/plugins/http_reporter_test.py -+++ b/test/plugins/http_reporter_test.py -@@ -39,7 +39,7 @@ - app = tornado.web.Application([(r"/results", ResultsHandler)]) - srv = tornado.httpserver.HTTPServer(app) - srv.listen(0) -- portnum = srv._socket.getsockname()[1] -+ portnum = self.get_port_number(srv) - - iol = tornado.ioloop.IOLoop.instance() - thread = threading.Thread(target=iol.start) -@@ -53,6 +53,14 @@ - iol.stop() - thread.join() - -+ def get_port_number(self, server): -+ -+ if hasattr(server, "_sockets"): # tornado > 2.0 -+ _socket = server._sockets.values()[0] -+ else: # tornado 1.2 or earlier -+ _socket = server._socket -+ return _socket.getsockname()[1] -+ - def test_http_reporter_reports(self): - """A simple test to make sure the HTTPReporter actually reports things.""" - -- 2.26.2