made drain work on messages as well as content

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@919251 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 17 deletions

diff --git a/python/qpid/tests/messaging/message.py b/python/qpid/tests/messaging/message.py
index 2f2acc13c3..654076588b 100644
--- a/python/qpid/tests/messaging/message.py
+++ b/python/qpid/tests/messaging/message.py
@@ -68,23 +68,7 @@ class MessageEchoTests(Base):
   def check(self, msg):
     self.snd.send(msg)
     echo = self.rcv.fetch(0)
-
-    assert msg.id == echo.id
-    assert msg.subject == echo.subject
-    assert msg.user_id == echo.user_id
-    assert msg.to == echo.to
-    assert msg.reply_to == echo.reply_to
-    assert msg.correlation_id == echo.correlation_id
-    assert msg.durable == echo.durable
-    assert msg.priority == echo.priority
-    if msg.ttl is None:
-      assert echo.ttl is None
-    else:
-      assert msg.ttl >= echo.ttl
-    assert msg.properties == echo.properties
-    assert msg.content_type == echo.content_type
-    assert msg.content == echo.content, "%s, %s" % (msg, echo)
-
+    self.assertEcho(msg, echo)
     self.ssn.acknowledge(echo)
 
   def testStringContent(self):