From d22ac4bbbd52fc8cbf80f864c49c904b0b24a529 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Tue, 11 Aug 2009 15:40:19 +0000 Subject: - removed old and redundent tests - removed old test harness in favor of qpid-python-test - modified qpid-python-test to support "skipped" tests, these are tests that failed due to an anticipated environmental reason such as the broker is not running or it is the wrong version - modified the qpid-python-test harness to exit with appropriate error codes based on the test results - modified the python clients to report version mismatches rather than framing errors - made qpid_config provide variables for 0-8, 0-9, and 0-10 versions of the spec - modified the 0-10 client to directly codegen classes - added new 0-10 framing layer based on push parsing rather than pull parsing - added numerous framing tests git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@803168 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/tests/messaging.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'python/qpid/tests/messaging.py') diff --git a/python/qpid/tests/messaging.py b/python/qpid/tests/messaging.py index 8a142d6c96..7706ebbabe 100644 --- a/python/qpid/tests/messaging.py +++ b/python/qpid/tests/messaging.py @@ -22,6 +22,7 @@ import time from qpid.tests import Test +from qpid.harness import Skipped from qpid.messaging import Connection, ConnectError, Disconnected, Empty, Message, UNLIMITED, uuid4 from Queue import Queue, Empty as QueueEmpty @@ -42,7 +43,10 @@ class Base(Test): def setup(self): self.test_id = uuid4() self.broker = self.config.broker - self.conn = self.setup_connection() + try: + self.conn = self.setup_connection() + except ConnectError, e: + raise Skipped(e) self.ssn = self.setup_session() self.snd = self.setup_sender() self.rcv = self.setup_receiver() @@ -65,7 +69,7 @@ class Base(Test): receiver = ssn.receiver("ping-queue") msg = receiver.fetch(0) ssn.acknowledge() - assert msg.content == content + assert msg.content == content, "expected %r, got %r" % (content, msg.content) def drain(self, rcv, limit=None): contents = [] -- cgit v1.2.1