You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2014/10/13 22:50:52 UTC
svn commit: r1631542 - in /qpid/proton/trunk: proton-c/bindings/python/
proton-c/include/proton/ proton-c/src/engine/ proton-c/src/events/
proton-c/src/messenger/ proton-j/src/main/java/org/apache/qpid/proton/engine/
proton-j/src/main/java/org/apache/q...
Author: rhs
Date: Mon Oct 13 20:50:51 2014
New Revision: 1631542
URL: http://svn.apache.org/r1631542
Log:
Renamed PN_{CONNECTION,SESSION,LINK}_{OPEN,CLOSE} to PN_{CONNECTION,SESSION,LINK}_LOCAL_{OPEN,CLOSE}
Modified:
qpid/proton/trunk/proton-c/bindings/python/proton.py
qpid/proton/trunk/proton-c/include/proton/event.h
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/proton-c/src/events/event.c
qpid/proton/trunk/proton-c/src/messenger/messenger.c
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java
qpid/proton/trunk/proton-j/src/main/resources/cengine.py
qpid/proton/trunk/tests/python/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=1631542&r1=1631541&r2=1631542&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/python/proton.py (original)
+++ qpid/proton/trunk/proton-c/bindings/python/proton.py Mon Oct 13 20:50:51 2014
@@ -3380,23 +3380,23 @@ class Event:
CONNECTION_INIT = PN_CONNECTION_INIT
CONNECTION_BOUND = PN_CONNECTION_BOUND
CONNECTION_UNBOUND = PN_CONNECTION_UNBOUND
- CONNECTION_OPEN = PN_CONNECTION_OPEN
- CONNECTION_CLOSE = PN_CONNECTION_CLOSE
+ CONNECTION_LOCAL_OPEN = PN_CONNECTION_LOCAL_OPEN
+ CONNECTION_LOCAL_CLOSE = PN_CONNECTION_LOCAL_CLOSE
CONNECTION_REMOTE_OPEN = PN_CONNECTION_REMOTE_OPEN
CONNECTION_REMOTE_CLOSE = PN_CONNECTION_REMOTE_CLOSE
CONNECTION_FINAL = PN_CONNECTION_FINAL
SESSION_INIT = PN_SESSION_INIT
- SESSION_OPEN = PN_SESSION_OPEN
- SESSION_CLOSE = PN_SESSION_CLOSE
+ SESSION_LOCAL_OPEN = PN_SESSION_LOCAL_OPEN
+ SESSION_LOCAL_CLOSE = PN_SESSION_LOCAL_CLOSE
SESSION_REMOTE_OPEN = PN_SESSION_REMOTE_OPEN
SESSION_REMOTE_CLOSE = PN_SESSION_REMOTE_CLOSE
SESSION_FINAL = PN_SESSION_FINAL
LINK_INIT = PN_LINK_INIT
- LINK_OPEN = PN_LINK_OPEN
- LINK_CLOSE = PN_LINK_CLOSE
- LINK_DETACH = PN_LINK_DETACH
+ LINK_LOCAL_OPEN = PN_LINK_LOCAL_OPEN
+ LINK_LOCAL_CLOSE = PN_LINK_LOCAL_CLOSE
+ LINK_LOCAL_DETACH = PN_LINK_LOCAL_DETACH
LINK_REMOTE_OPEN = PN_LINK_REMOTE_OPEN
LINK_REMOTE_CLOSE = PN_LINK_REMOTE_CLOSE
LINK_REMOTE_DETACH = PN_LINK_REMOTE_DETACH
Modified: qpid/proton/trunk/proton-c/include/proton/event.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/event.h?rev=1631542&r1=1631541&r2=1631542&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/event.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/event.h Mon Oct 13 20:50:51 2014
@@ -94,12 +94,14 @@ typedef enum {
PN_CONNECTION_INIT,
/**
- * The connection has been bound to a transport.
+ * The connection has been bound to a transport. This event is
+ * issued when the ::pn_transport_bind() operation is invoked.
*/
PN_CONNECTION_BOUND,
/**
- * The connection has been unbound from its transport.
+ * The connection has been unbound from its transport. This event is
+ * issued when the ::pn_transport_unbind() operation is invoked.
*/
PN_CONNECTION_UNBOUND,
@@ -107,7 +109,7 @@ typedef enum {
* The local connection endpoint has been closed. Events of this
* type point to the relevant connection.
*/
- PN_CONNECTION_OPEN,
+ PN_CONNECTION_LOCAL_OPEN,
/**
* The remote endpoint has opened the connection. Events of this
@@ -119,7 +121,7 @@ typedef enum {
* The local connection endpoint has been closed. Events of this
* type point to the relevant connection.
*/
- PN_CONNECTION_CLOSE,
+ PN_CONNECTION_LOCAL_CLOSE,
/**
* The remote endpoint has closed the connection. Events of this
@@ -144,7 +146,7 @@ typedef enum {
* The local session endpoint has been opened. Events of this type
* point ot the relevant session.
*/
- PN_SESSION_OPEN,
+ PN_SESSION_LOCAL_OPEN,
/**
* The remote endpoint has opened the session. Events of this type
@@ -156,7 +158,7 @@ typedef enum {
* The local session endpoint has been closed. Events of this type
* point ot the relevant session.
*/
- PN_SESSION_CLOSE,
+ PN_SESSION_LOCAL_CLOSE,
/**
* The remote endpoint has closed the session. Events of this type
@@ -181,7 +183,7 @@ typedef enum {
* The local link endpoint has been opened. Events of this type
* point ot the relevant link.
*/
- PN_LINK_OPEN,
+ PN_LINK_LOCAL_OPEN,
/**
* The remote endpoint has opened the link. Events of this type
@@ -193,7 +195,7 @@ typedef enum {
* The local link endpoint has been closed. Events of this type
* point ot the relevant link.
*/
- PN_LINK_CLOSE,
+ PN_LINK_LOCAL_CLOSE,
/**
* The remote endpoint has closed the link. Events of this type
@@ -205,7 +207,7 @@ typedef enum {
* The local link endpoint has been detached. Events of this type
* point to the relevant link.
*/
- PN_LINK_DETACH,
+ PN_LINK_LOCAL_DETACH,
/**
* The remote endpoint has detached the link. Events of this type
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=1631542&r1=1631541&r2=1631542&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Mon Oct 13 20:50:51 2014
@@ -52,12 +52,12 @@ pn_connection_t *pn_ep_get_connection(pn
static pn_event_type_t endpoint_event(pn_endpoint_type_t type, bool open) {
switch (type) {
case CONNECTION:
- return open ? PN_CONNECTION_OPEN : PN_CONNECTION_CLOSE;
+ return open ? PN_CONNECTION_LOCAL_OPEN : PN_CONNECTION_LOCAL_CLOSE;
case SESSION:
- return open ? PN_SESSION_OPEN : PN_SESSION_CLOSE;
+ return open ? PN_SESSION_LOCAL_OPEN : PN_SESSION_LOCAL_CLOSE;
case SENDER:
case RECEIVER:
- return open ? PN_LINK_OPEN : PN_LINK_CLOSE;
+ return open ? PN_LINK_LOCAL_OPEN : PN_LINK_LOCAL_CLOSE;
default:
assert(false);
return PN_EVENT_NONE;
@@ -267,7 +267,7 @@ void pn_link_detach(pn_link_t *link)
{
assert(link);
link->detached = true;
- pn_collector_put(link->session->connection->collector, PN_OBJECT, link, PN_LINK_DETACH);
+ pn_collector_put(link->session->connection->collector, PN_OBJECT, link, PN_LINK_LOCAL_DETACH);
pn_modified(link->session->connection, &link->endpoint, true);
}
Modified: qpid/proton/trunk/proton-c/src/events/event.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/events/event.c?rev=1631542&r1=1631541&r2=1631542&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/events/event.c (original)
+++ qpid/proton/trunk/proton-c/src/events/event.c Mon Oct 13 20:50:51 2014
@@ -242,40 +242,40 @@ const char *pn_event_type_name(pn_event_
return "PN_CONNECTION_UNBOUND";
case PN_CONNECTION_REMOTE_OPEN:
return "PN_CONNECTION_REMOTE_OPEN";
- case PN_CONNECTION_OPEN:
- return "PN_CONNECTION_OPEN";
+ case PN_CONNECTION_LOCAL_OPEN:
+ return "PN_CONNECTION_LOCAL_OPEN";
case PN_CONNECTION_REMOTE_CLOSE:
return "PN_CONNECTION_REMOTE_CLOSE";
- case PN_CONNECTION_CLOSE:
- return "PN_CONNECTION_CLOSE";
+ case PN_CONNECTION_LOCAL_CLOSE:
+ return "PN_CONNECTION_LOCAL_CLOSE";
case PN_CONNECTION_FINAL:
return "PN_CONNECTION_FINAL";
case PN_SESSION_INIT:
return "PN_SESSION_INIT";
case PN_SESSION_REMOTE_OPEN:
return "PN_SESSION_REMOTE_OPEN";
- case PN_SESSION_OPEN:
- return "PN_SESSION_OPEN";
+ case PN_SESSION_LOCAL_OPEN:
+ return "PN_SESSION_LOCAL_OPEN";
case PN_SESSION_REMOTE_CLOSE:
return "PN_SESSION_REMOTE_CLOSE";
- case PN_SESSION_CLOSE:
- return "PN_SESSION_CLOSE";
+ case PN_SESSION_LOCAL_CLOSE:
+ return "PN_SESSION_LOCAL_CLOSE";
case PN_SESSION_FINAL:
return "PN_SESSION_FINAL";
case PN_LINK_INIT:
return "PN_LINK_INIT";
case PN_LINK_REMOTE_OPEN:
return "PN_LINK_REMOTE_OPEN";
- case PN_LINK_OPEN:
- return "PN_LINK_OPEN";
+ case PN_LINK_LOCAL_OPEN:
+ return "PN_LINK_LOCAL_OPEN";
case PN_LINK_REMOTE_CLOSE:
return "PN_LINK_REMOTE_CLOSE";
- case PN_LINK_DETACH:
- return "PN_LINK_DETACH";
+ case PN_LINK_LOCAL_DETACH:
+ return "PN_LINK_LOCAL_DETACH";
case PN_LINK_REMOTE_DETACH:
return "PN_LINK_REMOTE_DETACH";
- case PN_LINK_CLOSE:
- return "PN_LINK_CLOSE";
+ case PN_LINK_LOCAL_CLOSE:
+ return "PN_LINK_LOCAL_CLOSE";
case PN_LINK_FLOW:
return "PN_LINK_FLOW";
case PN_LINK_FINAL:
Modified: qpid/proton/trunk/proton-c/src/messenger/messenger.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger/messenger.c?rev=1631542&r1=1631541&r2=1631542&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/messenger/messenger.c (original)
+++ qpid/proton/trunk/proton-c/src/messenger/messenger.c Mon Oct 13 20:50:51 2014
@@ -1266,22 +1266,22 @@ int pn_messenger_process_events(pn_messe
break;
case PN_CONNECTION_REMOTE_OPEN:
case PN_CONNECTION_REMOTE_CLOSE:
- case PN_CONNECTION_OPEN:
- case PN_CONNECTION_CLOSE:
+ case PN_CONNECTION_LOCAL_OPEN:
+ case PN_CONNECTION_LOCAL_CLOSE:
pn_messenger_process_connection(messenger, event);
break;
case PN_SESSION_REMOTE_OPEN:
case PN_SESSION_REMOTE_CLOSE:
- case PN_SESSION_OPEN:
- case PN_SESSION_CLOSE:
+ case PN_SESSION_LOCAL_OPEN:
+ case PN_SESSION_LOCAL_CLOSE:
pn_messenger_process_session(messenger, event);
break;
case PN_LINK_REMOTE_OPEN:
case PN_LINK_REMOTE_CLOSE:
case PN_LINK_REMOTE_DETACH:
- case PN_LINK_OPEN:
- case PN_LINK_CLOSE:
- case PN_LINK_DETACH:
+ case PN_LINK_LOCAL_OPEN:
+ case PN_LINK_LOCAL_CLOSE:
+ case PN_LINK_LOCAL_DETACH:
pn_messenger_process_link(messenger, event);
break;
case PN_LINK_FLOW:
Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java?rev=1631542&r1=1631541&r2=1631542&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java Mon Oct 13 20:50:51 2014
@@ -33,26 +33,26 @@ public interface Event
CONNECTION_INIT,
CONNECTION_BOUND,
CONNECTION_UNBOUND,
- CONNECTION_OPEN,
+ CONNECTION_LOCAL_OPEN,
CONNECTION_REMOTE_OPEN,
- CONNECTION_CLOSE,
+ CONNECTION_LOCAL_CLOSE,
CONNECTION_REMOTE_CLOSE,
CONNECTION_FINAL,
SESSION_INIT,
- SESSION_OPEN,
+ SESSION_LOCAL_OPEN,
SESSION_REMOTE_OPEN,
- SESSION_CLOSE,
+ SESSION_LOCAL_CLOSE,
SESSION_REMOTE_CLOSE,
SESSION_FINAL,
LINK_INIT,
- LINK_OPEN,
+ LINK_LOCAL_OPEN,
LINK_REMOTE_OPEN,
- LINK_CLOSE,
- LINK_REMOTE_CLOSE,
- LINK_DETACH,
+ LINK_LOCAL_DETACH,
LINK_REMOTE_DETACH,
+ LINK_LOCAL_CLOSE,
+ LINK_REMOTE_CLOSE,
LINK_FLOW,
LINK_FINAL,
Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java?rev=1631542&r1=1631541&r2=1631542&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java Mon Oct 13 20:50:51 2014
@@ -617,12 +617,12 @@ public class ConnectionImpl extends Endp
@Override
void localOpen()
{
- put(Event.Type.CONNECTION_OPEN, this);
+ put(Event.Type.CONNECTION_LOCAL_OPEN, this);
}
@Override
void localClose()
{
- put(Event.Type.CONNECTION_CLOSE, this);
+ put(Event.Type.CONNECTION_LOCAL_CLOSE, this);
}
}
Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java?rev=1631542&r1=1631541&r2=1631542&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java Mon Oct 13 20:50:51 2014
@@ -391,19 +391,19 @@ public abstract class LinkImpl extends E
@Override
void localOpen()
{
- getConnectionImpl().put(Event.Type.LINK_OPEN, this);
+ getConnectionImpl().put(Event.Type.LINK_LOCAL_OPEN, this);
}
@Override
void localClose()
{
- getConnectionImpl().put(Event.Type.LINK_CLOSE, this);
+ getConnectionImpl().put(Event.Type.LINK_LOCAL_CLOSE, this);
}
public void detach()
{
_detached = true;
- getConnectionImpl().put(Event.Type.LINK_DETACH, this);
+ getConnectionImpl().put(Event.Type.LINK_LOCAL_DETACH, this);
modified();
}
Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java?rev=1631542&r1=1631541&r2=1631542&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java Mon Oct 13 20:50:51 2014
@@ -204,12 +204,12 @@ public class SessionImpl extends Endpoin
@Override
void localOpen()
{
- getConnectionImpl().put(Event.Type.SESSION_OPEN, this);
+ getConnectionImpl().put(Event.Type.SESSION_LOCAL_OPEN, this);
}
@Override
void localClose()
{
- getConnectionImpl().put(Event.Type.SESSION_CLOSE, this);
+ getConnectionImpl().put(Event.Type.SESSION_LOCAL_CLOSE, this);
}
}
Modified: qpid/proton/trunk/proton-j/src/main/resources/cengine.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/resources/cengine.py?rev=1631542&r1=1631541&r2=1631542&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/resources/cengine.py (original)
+++ qpid/proton/trunk/proton-j/src/main/resources/cengine.py Mon Oct 13 20:50:51 2014
@@ -954,23 +954,23 @@ from org.apache.qpid.proton.engine impor
PN_CONNECTION_INIT = Event.Type.CONNECTION_INIT
PN_CONNECTION_BOUND = Event.Type.CONNECTION_BOUND
PN_CONNECTION_UNBOUND = Event.Type.CONNECTION_UNBOUND
-PN_CONNECTION_OPEN = Event.Type.CONNECTION_OPEN
+PN_CONNECTION_LOCAL_OPEN = Event.Type.CONNECTION_LOCAL_OPEN
PN_CONNECTION_REMOTE_OPEN = Event.Type.CONNECTION_REMOTE_OPEN
-PN_CONNECTION_CLOSE = Event.Type.CONNECTION_CLOSE
+PN_CONNECTION_LOCAL_CLOSE = Event.Type.CONNECTION_LOCAL_CLOSE
PN_CONNECTION_REMOTE_CLOSE = Event.Type.CONNECTION_REMOTE_CLOSE
PN_CONNECTION_FINAL = Event.Type.CONNECTION_FINAL
PN_SESSION_INIT = Event.Type.SESSION_INIT
-PN_SESSION_OPEN = Event.Type.SESSION_OPEN
+PN_SESSION_LOCAL_OPEN = Event.Type.SESSION_LOCAL_OPEN
PN_SESSION_REMOTE_OPEN = Event.Type.SESSION_REMOTE_OPEN
-PN_SESSION_CLOSE = Event.Type.SESSION_CLOSE
+PN_SESSION_LOCAL_CLOSE = Event.Type.SESSION_LOCAL_CLOSE
PN_SESSION_REMOTE_CLOSE = Event.Type.SESSION_REMOTE_CLOSE
PN_SESSION_FINAL = Event.Type.SESSION_FINAL
PN_LINK_INIT = Event.Type.LINK_INIT
-PN_LINK_OPEN = Event.Type.LINK_OPEN
+PN_LINK_LOCAL_OPEN = Event.Type.LINK_LOCAL_OPEN
PN_LINK_REMOTE_OPEN = Event.Type.LINK_REMOTE_OPEN
-PN_LINK_CLOSE = Event.Type.LINK_CLOSE
+PN_LINK_LOCAL_CLOSE = Event.Type.LINK_LOCAL_CLOSE
PN_LINK_REMOTE_CLOSE = Event.Type.LINK_REMOTE_CLOSE
-PN_LINK_DETACH = Event.Type.LINK_DETACH
+PN_LINK_LOCAL_DETACH = Event.Type.LINK_LOCAL_DETACH
PN_LINK_REMOTE_DETACH = Event.Type.LINK_REMOTE_DETACH
PN_LINK_FLOW = Event.Type.LINK_FLOW
PN_LINK_FINAL = Event.Type.LINK_FINAL
Modified: qpid/proton/trunk/tests/python/proton_tests/engine.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tests/python/proton_tests/engine.py?rev=1631542&r1=1631541&r2=1631542&view=diff
==============================================================================
--- qpid/proton/trunk/tests/python/proton_tests/engine.py (original)
+++ qpid/proton/trunk/tests/python/proton_tests/engine.py Mon Oct 13 20:50:51 2014
@@ -2139,13 +2139,13 @@ class EventTest(CollectorTest):
rcv = ssn2.receiver("receiver")
rcv.open()
self.pump()
- self.expect(Event.CONNECTION_OPEN, Event.TRANSPORT,
- Event.SESSION_INIT, Event.SESSION_OPEN,
- Event.TRANSPORT, Event.LINK_INIT, Event.LINK_OPEN,
+ self.expect(Event.CONNECTION_LOCAL_OPEN, Event.TRANSPORT,
+ Event.SESSION_INIT, Event.SESSION_LOCAL_OPEN,
+ Event.TRANSPORT, Event.LINK_INIT, Event.LINK_LOCAL_OPEN,
Event.TRANSPORT)
rcv.close()
- self.expect(Event.LINK_CLOSE, Event.TRANSPORT)
+ self.expect(Event.LINK_LOCAL_CLOSE, Event.TRANSPORT)
self.pump()
rcv.free()
del rcv
@@ -2209,7 +2209,7 @@ class EventTest(CollectorTest):
rcv.flow(10)
self.pump()
self.expect(Event.CONNECTION_INIT, Event.SESSION_INIT,
- Event.LINK_INIT, Event.LINK_OPEN, Event.TRANSPORT)
+ Event.LINK_INIT, Event.LINK_LOCAL_OPEN, Event.TRANSPORT)
snd.delivery("delivery")
snd.send("Hello World!")
snd.advance()
@@ -2229,7 +2229,7 @@ class EventTest(CollectorTest):
dlv = snd.delivery("delivery")
snd.send("Hello World!")
assert snd.advance()
- self.expect(Event.LINK_OPEN, Event.TRANSPORT)
+ self.expect(Event.LINK_LOCAL_OPEN, Event.TRANSPORT)
self.pump()
self.expect(Event.LINK_FLOW)
rdlv = rcv.current
@@ -2276,7 +2276,7 @@ class EventTest(CollectorTest):
t.bind(c)
c.open()
- self.expect(Event.CONNECTION_BOUND, Event.CONNECTION_OPEN, Event.TRANSPORT)
+ self.expect(Event.CONNECTION_BOUND, Event.CONNECTION_LOCAL_OPEN, Event.TRANSPORT)
c2 = Connection()
t2 = Transport()
@@ -2293,7 +2293,7 @@ class EventTest(CollectorTest):
pump(t, t2)
- self.expect(Event.CONNECTION_CLOSE, Event.TRANSPORT,
+ self.expect(Event.CONNECTION_LOCAL_CLOSE, Event.TRANSPORT,
Event.TRANSPORT_HEAD_CLOSED, Event.TRANSPORT_CLOSED)
def testLinkDetach(self):
@@ -2307,7 +2307,7 @@ class EventTest(CollectorTest):
l1 = s1.sender("asdf")
l1.open()
l1.detach()
- self.expect_until(Event.LINK_DETACH, Event.TRANSPORT)
+ self.expect_until(Event.LINK_LOCAL_DETACH, Event.TRANSPORT)
c2 = Connection()
c2.collect(self.collector)
@@ -2339,15 +2339,15 @@ class TeardownLeakTest(PeerTest):
def doLeak(self, local, remote):
self.connection.open()
self.expect(Event.CONNECTION_INIT, Event.CONNECTION_BOUND,
- Event.CONNECTION_OPEN, Event.TRANSPORT)
+ Event.CONNECTION_LOCAL_OPEN, Event.TRANSPORT)
ssn = self.connection.session()
ssn.open()
- self.expect(Event.SESSION_INIT, Event.SESSION_OPEN, Event.TRANSPORT)
+ self.expect(Event.SESSION_INIT, Event.SESSION_LOCAL_OPEN, Event.TRANSPORT)
snd = ssn.sender("sender")
snd.open()
- self.expect(Event.LINK_INIT, Event.LINK_OPEN, Event.TRANSPORT)
+ self.expect(Event.LINK_INIT, Event.LINK_LOCAL_OPEN, Event.TRANSPORT)
self.pump()
@@ -2364,11 +2364,11 @@ class TeardownLeakTest(PeerTest):
if local:
snd.close() # ha!!
- self.expect(Event.LINK_CLOSE, Event.TRANSPORT)
+ self.expect(Event.LINK_LOCAL_CLOSE, Event.TRANSPORT)
ssn.close()
- self.expect(Event.SESSION_CLOSE, Event.TRANSPORT)
+ self.expect(Event.SESSION_LOCAL_CLOSE, Event.TRANSPORT)
self.connection.close()
- self.expect(Event.CONNECTION_CLOSE, Event.TRANSPORT)
+ self.expect(Event.CONNECTION_LOCAL_CLOSE, Event.TRANSPORT)
if remote:
self.peer.link_head(0).close() # ha!!
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org