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 2010/04/14 14:02:00 UTC

svn commit: r933920 - in /qpid/trunk/qpid/python/qpid: messaging/endpoints.py tests/messaging/endpoints.py

Author: rhs
Date: Wed Apr 14 12:01:59 2010
New Revision: 933920

URL: http://svn.apache.org/viewvc?rev=933920&view=rev
Log:
added get_error

Modified:
    qpid/trunk/qpid/python/qpid/messaging/endpoints.py
    qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py

Modified: qpid/trunk/qpid/python/qpid/messaging/endpoints.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging/endpoints.py?rev=933920&r1=933919&r2=933920&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/messaging/endpoints.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging/endpoints.py Wed Apr 14 12:01:59 2010
@@ -177,6 +177,9 @@ class Connection:
       self._condition.gc()
       raise self.error
 
+  def get_error(self):
+    return self.error
+
   def _ewait(self, predicate, timeout=None):
     result = self._wait(lambda: self.error or predicate(), timeout)
     self.check_error()
@@ -513,6 +516,13 @@ class Session:
     if self.error:
       raise self.error
 
+  def get_error(self):
+    err = self.connection.get_error()
+    if err:
+      return err
+    else:
+      return self.error
+
   def _ewait(self, predicate, timeout=None):
     result = self.connection._ewait(lambda: self.error or predicate(), timeout)
     self.check_error()
@@ -710,6 +720,13 @@ class Sender:
     if self.error:
       raise self.error
 
+  def get_error(self):
+    err = self.session.get_error()
+    if err:
+      return err
+    else:
+      return self.error
+
   def _ewait(self, predicate, timeout=None):
     result = self.session._ewait(lambda: self.error or predicate(), timeout)
     self.check_error()
@@ -853,6 +870,13 @@ class Receiver(object):
     if self.error:
       raise self.error
 
+  def get_error(self):
+    err = self.session.get_error()
+    if err:
+      return err
+    else:
+      return self.error
+
   def _ewait(self, predicate, timeout=None):
     result = self.session._ewait(lambda: self.error or predicate(), timeout)
     self.check_error()

Modified: qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py?rev=933920&r1=933919&r2=933920&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py (original)
+++ qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py Wed Apr 14 12:01:59 2010
@@ -44,6 +44,14 @@ class SetupTests(Base):
     except ConnectError, e:
       assert "Connection refused" in str(e)
 
+  def testGetError(self):
+    self.conn = Connection("localhost:0")
+    try:
+      self.conn.open()
+      assert False, "connect succeeded"
+    except ConnectError, e:
+      assert self.conn.get_error() == e
+
   def use_fds(self):
     fds = []
     try:



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org