diff options
| author | Alan Conway <aconway@apache.org> | 2012-01-25 22:46:45 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-01-25 22:46:45 +0000 |
| commit | b7ad9087a63f885f5fd475b0fd13a784ab0b9303 (patch) | |
| tree | 83b0f89b390eb02e11d063645ab2b8591856f748 | |
| parent | 9f5d14cfd7d497a5f70c508b22fa7c31070a0a62 (diff) | |
| download | qpid-python-b7ad9087a63f885f5fd475b0fd13a784ab0b9303.tar.gz | |
QPID-3603: Remove FIXME comment from python driver.py
Fix agreed on by rhs. Updated test endpoints.py from trunk.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-2@1235975 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/python/qpid/messaging/driver.py | 2 | ||||
| -rw-r--r-- | qpid/python/qpid/tests/messaging/endpoints.py | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/qpid/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py index ff657653e0..0358659111 100644 --- a/qpid/python/qpid/messaging/driver.py +++ b/qpid/python/qpid/messaging/driver.py @@ -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() diff --git a/qpid/python/qpid/tests/messaging/endpoints.py b/qpid/python/qpid/tests/messaging/endpoints.py index 935db54458..db5ec03df2 100644 --- a/qpid/python/qpid/tests/messaging/endpoints.py +++ b/qpid/python/qpid/tests/messaging/endpoints.py @@ -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() |