You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2015/06/18 22:15:32 UTC
[27/50] [abbrv] qpid-proton git commit: PROTON-490: fix some py34
incompatibilities
PROTON-490: fix some py34 incompatibilities
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/ce45c3a4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/ce45c3a4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/ce45c3a4
Branch: refs/heads/kgiusti-python3
Commit: ce45c3a4bfc4174258ae0c681c883fb27e43404a
Parents: fc3f4f5
Author: Flavio Percoco <fl...@gmail.com>
Authored: Sun Jun 14 00:39:41 2015 +0200
Committer: Ken Giusti <kg...@apache.org>
Committed: Mon Jun 15 13:37:25 2015 -0400
----------------------------------------------------------------------
tests/python/proton_tests/engine.py | 16 ++++++++--------
tests/python/proton_tests/sasl.py | 2 --
2 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ce45c3a4/tests/python/proton_tests/engine.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/engine.py b/tests/python/proton_tests/engine.py
index 143e7d5..fcc648e 100644
--- a/tests/python/proton_tests/engine.py
+++ b/tests/python/proton_tests/engine.py
@@ -2533,10 +2533,10 @@ class SaslEventTest(CollectorTest):
s.allowed_mechs("ANONYMOUS PLAIN")
transport.bind(conn)
self.expect(Event.CONNECTION_INIT, Event.CONNECTION_BOUND)
- transport.push('AMQP\x03\x01\x00\x00\x00\x00\x00\x1c\x02\x01\x00\x00\x00S@'
- '\xc0\x0f\x01\xe0\x0c\x01\xa3\tANONYMOUS\x00\x00\x00\x10'
- '\x02\x01\x00\x00\x00SD\xc0\x03\x01P\x00AMQP\x00\x01\x00'
- '\x00')
+ transport.push(str2bin('AMQP\x03\x01\x00\x00\x00\x00\x00\x1c\x02\x01\x00\x00\x00S@'
+ '\xc0\x0f\x01\xe0\x0c\x01\xa3\tANONYMOUS\x00\x00\x00\x10'
+ '\x02\x01\x00\x00\x00SD\xc0\x03\x01P\x00AMQP\x00\x01\x00'
+ '\x00'))
self.expect(Event.TRANSPORT)
p = transport.pending()
bytes = transport.peek(p)
@@ -2559,10 +2559,10 @@ class SaslEventTest(CollectorTest):
bytes = transport.peek(p)
transport.pop(p)
self.expect(Event.CONNECTION_INIT, Event.CONNECTION_BOUND, Event.TRANSPORT)
- transport.push('AMQP\x03\x01\x00\x00\x00\x00\x00\x1c\x02\x01\x00\x00\x00S@'
- '\xc0\x0f\x01\xe0\x0c\x01\xa3\tANONYMOUS\x00\x00\x00\x10'
- '\x02\x01\x00\x00\x00SD\xc0\x03\x01P\x00AMQP\x00\x01\x00'
- '\x00')
+ transport.push(str2bin('AMQP\x03\x01\x00\x00\x00\x00\x00\x1c\x02\x01\x00\x00\x00S@'
+ '\xc0\x0f\x01\xe0\x0c\x01\xa3\tANONYMOUS\x00\x00\x00\x10'
+ '\x02\x01\x00\x00\x00SD\xc0\x03\x01P\x00AMQP\x00\x01\x00'
+ '\x00'))
self.expect(Event.TRANSPORT)
p = transport.pending()
bytes = transport.peek(p)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ce45c3a4/tests/python/proton_tests/sasl.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/sasl.py b/tests/python/proton_tests/sasl.py
index b214b62..b4e9c7a 100644
--- a/tests/python/proton_tests/sasl.py
+++ b/tests/python/proton_tests/sasl.py
@@ -27,8 +27,6 @@ from proton import *
from .common import pump, Skipped
from proton._compat import str2bin
-from cproton import *
-
def _sslCertpath(file):
""" Return the full path to the certificate,keyfile, etc.
"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org