diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2013-07-26 17:13:19 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2013-07-26 17:13:19 +0000 |
| commit | f99c839c8f23054c21af6ed797f68615b04c2179 (patch) | |
| tree | b4a77d2decba0d074d8613509fc1222326469fcc | |
| parent | 0c49148f81cd5d938ad58289cd56696cf97c91f4 (diff) | |
| download | qpid-python-f99c839c8f23054c21af6ed797f68615b04c2179.tar.gz | |
QPID-5019: add flag to distinguish QMFv2 events
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1507370 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | cpp/src/tests/qpidd_qmfv2_tests.py | 9 | ||||
| -rw-r--r-- | extras/qmf/src/py/qmf/console.py | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/cpp/src/tests/qpidd_qmfv2_tests.py b/cpp/src/tests/qpidd_qmfv2_tests.py index bd64928dae..55497ccc03 100755 --- a/cpp/src/tests/qpidd_qmfv2_tests.py +++ b/cpp/src/tests/qpidd_qmfv2_tests.py @@ -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): diff --git a/extras/qmf/src/py/qmf/console.py b/extras/qmf/src/py/qmf/console.py index 50a61afce0..640195964e 100644 --- a/extras/qmf/src/py/qmf/console.py +++ b/extras/qmf/src/py/qmf/console.py @@ -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() |