svn commit: r794844 - in /qpid/trunk/qpid/python/qpid: messaging.py tests/__init__.py tests/messaging.py

[rh...@apache.org]

Author: rhs
Date: Thu Jul 16 20:41:20 2009
New Revision: 794844

URL: http://svn.apache.org/viewvc?rev=794844&view=rev
Log:
added a ConnectError exception

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

Modified: qpid/trunk/qpid/python/qpid/messaging.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging.py?rev=794844&r1=794843&r2=794844&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/messaging.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging.py Thu Jul 16 20:41:20 2009
@@ -30,7 +30,7 @@
   - protocol negotiation/multiprotocol impl
 """
 
-import connection, time, sys, traceback
+import connection, time, socket, sys, traceback
 from codec010 import StringCodec
 from datatypes import timestamp, uuid4, RangedSet, Message as Message010
 from logging import getLogger
@@ -101,6 +101,9 @@
 
 UNLIMITED = Constant("UNLIMITED", 0xFFFFFFFFL)
 
+class ConnectError(Exception):
+  pass
+
 class Connection(Lockable):
 
   """
@@ -185,7 +188,10 @@
     """
     if self._conn is not None:
       return
-    self._socket = connect(self.host, self.port)
+    try:
+      self._socket = connect(self.host, self.port)
+    except socket.error, e:
+      raise ConnectError(*e.args)
     self._conn = connection.Connection(self._socket)
     self._conn.start()
 

Modified: qpid/trunk/qpid/python/qpid/tests/__init__.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/tests/__init__.py?rev=794844&r1=794843&r2=794844&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/tests/__init__.py (original)
+++ qpid/trunk/qpid/python/qpid/tests/__init__.py Thu Jul 16 20:41:20 2009
@@ -25,4 +25,4 @@
   def configure(self, config):
     self.config = config
 
-import messaging
+import messaging, framing

Modified: qpid/trunk/qpid/python/qpid/tests/messaging.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/tests/messaging.py?rev=794844&r1=794843&r2=794844&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/tests/messaging.py (original)
+++ qpid/trunk/qpid/python/qpid/tests/messaging.py Thu Jul 16 20:41:20 2009
@@ -22,7 +22,7 @@
 
 import time
 from qpid.tests import Test
-from qpid.messaging import Connection, Disconnected, Empty, Message, UNLIMITED, uuid4
+from qpid.messaging import Connection, ConnectError, Disconnected, Empty, Message, UNLIMITED, uuid4
 from Queue import Queue, Empty as QueueEmpty
 
 class Base(Test):
@@ -99,6 +99,13 @@
     self.conn.connect()
     self.ping(self.conn.session())
 
+  def testConnectError(self):
+    try:
+      self.conn = Connection.open("localhost", 0)
+      assert False, "connect succeeded"
+    except ConnectError:
+      pass
+
 class ConnectionTests(Base):
 
   def setup_connection(self):



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