From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6EBAF138359 for ; Tue, 21 Jul 2020 15:50:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A6B2E0921; Tue, 21 Jul 2020 15:50:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F139E0921 for ; Tue, 21 Jul 2020 15:50:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23F2634F43C for ; Tue, 21 Jul 2020 15:50:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D3D32E5 for ; Tue, 21 Jul 2020 15:50:28 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1595346610.30c4d6b868c0724fb1865a5ed9668b1f69e1abff.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/autobahn/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch X-VCS-Directories: dev-python/autobahn/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 30c4d6b868c0724fb1865a5ed9668b1f69e1abff X-VCS-Branch: master Date: Tue, 21 Jul 2020 15:50:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e77faa35-3bfa-4abc-8b57-de964180ad4c X-Archives-Hash: 5920d5ebd7c01777912899ccbc717a86 commit: 30c4d6b868c0724fb1865a5ed9668b1f69e1abff Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Jul 21 14:06:36 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 21 15:50:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30c4d6b8 dev-python/autobahn: remove unused patch(es) Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16763 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/autobahn-18.3.1-Fix-cs-test-955.patch | 95 ---------------------- 1 file changed, 95 deletions(-) diff --git a/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch b/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch deleted file mode 100644 index a62f48569ce..00000000000 --- a/dev-python/autobahn/files/autobahn-18.3.1-Fix-cs-test-955.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 604bc53a3beec173020c944ce9cb38afca2a9126 Mon Sep 17 00:00:00 2001 -From: Tobias Oberstein -Date: Fri, 9 Mar 2018 10:37:31 +0100 -Subject: [PATCH] Fix cs test (#955) - -* encode test string - -* already an instance - -* add extra deps (encryption) - -* add extra deps - -* deactivate py 3.3, tx < 15.4 - -* systematic version coverage - -* fix coverage (hopefully) - -* another try - -* actually need to yield, as a future is returned ---- - .travis.yml | 58 ++++++++++++++++++++++++++++++++--- - Makefile | 3 ++ - autobahn/asyncio/rawsocket.py | 2 +- - autobahn/wamp/test/test_cryptosign.py | 18 +++++++++-- - tox.ini | 32 ++++++++++--------- - 5 files changed, 89 insertions(+), 24 deletions(-) - -diff --git a/autobahn/asyncio/rawsocket.py b/autobahn/asyncio/rawsocket.py -index 130a8e41..bbb83337 100644 ---- a/autobahn/asyncio/rawsocket.py -+++ b/autobahn/asyncio/rawsocket.py -@@ -408,7 +408,7 @@ class WampRawSocketClientProtocol(WampRawSocketMixinGeneral, WampRawSocketMixinA - @property - def serializer_id(self): - if not hasattr(self, '_serializer'): -- self._serializer = self.factory._serializer() -+ self._serializer = self.factory._serializer - return self._serializer.RAWSOCKET_SERIALIZER_ID - - def get_channel_id(self, channel_id_type=u'tls-unique'): -diff --git a/autobahn/wamp/test/test_cryptosign.py b/autobahn/wamp/test/test_cryptosign.py -index 700ca3cc..78f8d556 100644 ---- a/autobahn/wamp/test/test_cryptosign.py -+++ b/autobahn/wamp/test/test_cryptosign.py -@@ -25,9 +25,21 @@ - ############################################################################### - - from __future__ import absolute_import -+ - import hashlib -+import os -+ - from mock import Mock - -+import txaio -+ -+if os.environ.get('USE_TWISTED', False): -+ txaio.use_twisted() -+elif os.environ.get('USE_ASYNCIO', False): -+ txaio.use_asyncio() -+else: -+ raise Exception('no networking framework selected') -+ - from autobahn.wamp.cryptosign import _makepad, HAS_CRYPTOSIGN - from autobahn.wamp import types - from autobahn.wamp.auth import create_authenticator -@@ -59,14 +71,14 @@ def setUp(self): - self.key = SigningKey.from_ssh_data(keybody) - self.privkey_hex = self.key._key.encode(encoder=HexEncoder) - m = hashlib.sha256() -- m.update("some TLS message") -+ m.update("some TLS message".encode()) - self.channel_id = m.digest() - - def test_valid(self): - session = Mock() - session._transport.get_channel_id = Mock(return_value=self.channel_id) - challenge = types.Challenge(u"ticket", dict(challenge="ff" * 32)) -- signed = self.key.sign_challenge(session, challenge) -+ signed = yield self.key.sign_challenge(session, challenge) - self.assertEqual( - u'9b6f41540c9b95b4b7b281c3042fa9c54cef43c842d62ea3fd6030fcb66e70b3e80d49d44c29d1635da9348d02ec93f3ed1ef227dfb59a07b580095c2b82f80f9d16ca518aa0c2b707f2b2a609edeca73bca8dd59817a633f35574ac6fd80d00', - signed.result, -@@ -81,7 +93,7 @@ def test_authenticator(self): - session = Mock() - session._transport.get_channel_id = Mock(return_value=self.channel_id) - challenge = types.Challenge(u"cryptosign", dict(challenge="ff" * 32)) -- reply = authenticator.on_challenge(session, challenge) -+ reply = yield authenticator.on_challenge(session, challenge) - self.assertEqual( - reply.result, - u'9b6f41540c9b95b4b7b281c3042fa9c54cef43c842d62ea3fd6030fcb66e70b3e80d49d44c29d1635da9348d02ec93f3ed1ef227dfb59a07b580095c2b82f80f9d16ca518aa0c2b707f2b2a609edeca73bca8dd59817a633f35574ac6fd80d00',