Author: kgiusti
Date: Mon Oct 22 21:51:05 2012
New Revision: 1401097
URL: http://svn.apache.org/viewvc?rev=1401097&view=rev
Log:
PROTON-79: fix the busted java tests (skipped for now)
Modified:
qpid/proton/trunk/proton-c/bindings/python/proton.py
qpid/proton/trunk/proton-c/include/proton/engine.h
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/proton-j/src/main/scripts/proton.py
qpid/proton/trunk/tests/proton_tests/engine.py
Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/proton.py?rev=1401097&r1=1401096&r2=1401097&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/python/proton.py (original)
+++ qpid/proton/trunk/proton-c/bindings/python/proton.py Mon Oct 22 21:51:05
2012
@@ -1903,8 +1903,9 @@ class Transport(object):
Sets the maximum size for received frames (in bytes).
""")
- def peer_max_frame_size(self):
- return pn_transport_get_peer_max_frame(self._trans)
+ @property
+ def remote_max_frame_size(self):
+ return pn_transport_get_remote_max_frame(self._trans)
class SASLException(TransportException):
pass
Modified: qpid/proton/trunk/proton-c/include/proton/engine.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/engine.h?rev=1401097&r1=1401096&r2=1401097&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/engine.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/engine.h Mon Oct 22 21:51:05 2012
@@ -280,7 +280,7 @@ void pn_transport_trace(pn_transport_t *
// max frame of zero means "unlimited"
uint32_t pn_transport_get_max_frame(pn_transport_t *transport);
void pn_transport_set_max_frame(pn_transport_t *transport, uint32_t size);
-uint32_t pn_transport_get_peer_max_frame(pn_transport_t *transport);
+uint32_t pn_transport_get_remote_max_frame(pn_transport_t *transport);
void pn_transport_free(pn_transport_t *transport);
// session
Modified: qpid/proton/trunk/proton-c/src/engine/engine.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine.c?rev=1401097&r1=1401096&r2=1401097&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Mon Oct 22 21:51:05 2012
@@ -2380,7 +2380,7 @@ void pn_transport_set_max_frame(pn_trans
transport->local_max_frame = size;
}
-uint32_t pn_transport_get_peer_max_frame(pn_transport_t *transport)
+uint32_t pn_transport_get_remote_max_frame(pn_transport_t *transport)
{
return transport->remote_max_frame;
}
Modified: qpid/proton/trunk/proton-j/src/main/scripts/proton.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/scripts/proton.py?rev=1401097&r1=1401096&r2=1401097&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/scripts/proton.py (original)
+++ qpid/proton/trunk/proton-j/src/main/scripts/proton.py Mon Oct 22 21:51:05
2012
@@ -393,6 +393,24 @@ class Transport(object):
def input(self, bytes):
return self.impl.input(bytes, 0, len(bytes))
+ def _get_max_frame_size(self):
+ #return pn_transport_get_max_frame(self._trans)
+ raise Skipped()
+
+ def _set_max_frame_size(self, value):
+ #pn_transport_set_max_frame(self._trans, value)
+ raise Skipped()
+
+ max_frame_size = property(_get_max_frame_size, _set_max_frame_size,
+ doc="""
+Sets the maximum size for received frames (in bytes).
+""")
+
+ @property
+ def remote_max_frame_size(self):
+ #return pn_transport_get_remote_max_frame(self._trans)
+ raise Skipped()
+
class Data(object):
SYMBOL = None
Modified: qpid/proton/trunk/tests/proton_tests/engine.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton_tests/engine.py?rev=1401097&r1=1401096&r2=1401097&view=diff
==============================================================================
--- qpid/proton/trunk/tests/proton_tests/engine.py (original)
+++ qpid/proton/trunk/tests/proton_tests/engine.py Mon Oct 22 21:51:05 2012
@@ -584,7 +584,7 @@ class MaxFrameTransferTest(Test):
self.rcv.open()
self.pump()
assert self.rcv.session.connection._transport.max_frame_size == 512
- assert self.snd.session.connection._transport.peer_max_frame_size() == 512
+ assert self.snd.session.connection._transport.remote_max_frame_size == 512
self.rcv.flow(1)
self.snd.delivery("tag")
@@ -613,7 +613,7 @@ class MaxFrameTransferTest(Test):
self.rcv.open()
self.pump()
assert self.rcv.session.connection._transport.max_frame_size == 521
- assert self.snd.session.connection._transport.peer_max_frame_size() == 521
+ assert self.snd.session.connection._transport.remote_max_frame_size == 521
self.rcv.flow(2)
self.snd.delivery("tag")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
