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 2013/07/26 19:13:19 UTC
svn commit: r1507370 - in /qpid/trunk/qpid:
cpp/src/tests/qpidd_qmfv2_tests.py extras/qmf/src/py/qmf/console.py
Author: kgiusti
Date: Fri Jul 26 17:13:19 2013
New Revision: 1507370
URL: http://svn.apache.org/r1507370
Log:
QPID-5019: add flag to distinguish QMFv2 events
Modified:
qpid/trunk/qpid/cpp/src/tests/qpidd_qmfv2_tests.py
qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
Modified: qpid/trunk/qpid/cpp/src/tests/qpidd_qmfv2_tests.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpidd_qmfv2_tests.py?rev=1507370&r1=1507369&r2=1507370&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpidd_qmfv2_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpidd_qmfv2_tests.py Fri Jul 26 17:13:19 2013
@@ -88,7 +88,9 @@ class ConsoleTest(BrokerTest):
class Handler(qmf.console.Console):
def __init__(self):
self.v1_oids = 0
+ self.v1_events = 0
self.v2_oids = 0
+ self.v2_events = 0
self.broker_info = []
self.broker_conn = []
self.newpackage = []
@@ -116,6 +118,11 @@ class ConsoleTest(BrokerTest):
def event(self, broker, event):
#print "EVENT %s" % event
self.events.append(event)
+ if event.isV2:
+ self.v2_events += 1
+ else:
+ self.v1_events += 1
+
def heartbeat(self, agent, timestamp):
#print "Heartbeat %s" % agent
self.heartbeats.append( (agent, timestamp) )
@@ -178,8 +185,10 @@ class ConsoleTest(BrokerTest):
# verify that the published objects were of the correct QMF version
if self._broker_is_v1:
assert handler.v1_oids and handler.v2_oids == 0, "QMFv2 updates received while in V1-only mode!"
+ assert handler.v1_events and handler.v2_events == 0, "QMFv2 events received while in V1-only mode!"
else:
assert handler.v2_oids and handler.v1_oids == 0, "QMFv1 updates received while in V2-only mode!"
+ assert handler.v2_events and handler.v1_events == 0, "QMFv1 events received while in V2-only mode!"
def _test_async_method(self):
class Handler (qmf.console.Console):
Modified: qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py?rev=1507370&r1=1507369&r2=1507370&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py (original)
+++ qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py Fri Jul 26 17:13:19 2013
@@ -3943,6 +3943,7 @@ class Event:
self.broker = agent.broker
if isinstance(v2Map,dict):
+ self.isV2 = True
self.classKey = None
self.schema = None
try:
@@ -3958,6 +3959,7 @@ class Event:
self.schema = self.session.schemaCache.getSchema(self.classKey)
elif codec is not None:
+ self.isV2 = None
self.classKey = ClassKey(codec)
self.classKey._setType(ClassKey.TYPE_EVENT)
self.timestamp = codec.read_int64()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org