Author: aconway
Date: Wed Jan 25 22:46:45 2012
New Revision: 1235975
URL: http://svn.apache.org/viewvc?rev=1235975&view=rev
Log:
QPID-3603: Remove FIXME comment from python driver.py
Fix agreed on by rhs. Updated test endpoints.py from trunk.
Modified:
qpid/branches/qpid-3603-2/qpid/python/qpid/messaging/driver.py
qpid/branches/qpid-3603-2/qpid/python/qpid/tests/messaging/endpoints.py
Modified: qpid/branches/qpid-3603-2/qpid/python/qpid/messaging/driver.py
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-2/qpid/python/qpid/messaging/driver.py?rev=1235975&r1=1235974&r2=1235975&view=diff
==============================================================================
--- qpid/branches/qpid-3603-2/qpid/python/qpid/messaging/driver.py (original)
+++ qpid/branches/qpid-3603-2/qpid/python/qpid/messaging/driver.py Wed Jan 25
22:46:45 2012
@@ -533,8 +533,6 @@ class Driver:
log.warn("reconnect succeeded: %s:%s", host, port)
self._next_retry = None
self._attempts = 0
- # FIXME aconway 2012-01-23: is this correct
-# self._host = 0
self._delay = self.connection.reconnect_interval_min
self._retrying = False
self.schedule()
Modified:
qpid/branches/qpid-3603-2/qpid/python/qpid/tests/messaging/endpoints.py
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-2/qpid/python/qpid/tests/messaging/endpoints.py?rev=1235975&r1=1235974&r2=1235975&view=diff
==============================================================================
--- qpid/branches/qpid-3603-2/qpid/python/qpid/tests/messaging/endpoints.py
(original)
+++ qpid/branches/qpid-3603-2/qpid/python/qpid/tests/messaging/endpoints.py Wed
Jan 25 22:46:45 2012
@@ -886,11 +886,9 @@ class ReceiverTests(Base):
rc = self.ssn.receiver('test-receiver-queue; {mode: consume}')
self.drain(rb, expected=msgs)
self.drain(rc, expected=msgs)
- rc2 = self.ssn.receiver(rc.source)
- self.assertEmpty(rc2)
- self.drain(self.rcv, expected=[])
rb2 = self.ssn.receiver(rb.source)
- self.drain(rb2, expected=msgs)
+ self.assertEmpty(rb2)
+ self.drain(self.rcv, expected=[])
# XXX: need testUnsettled()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
