Merge lp:~lifeless/python-oops-amqp/0.0.4 into lp:python-oops-amqp
Proposed by
Robert Collins
Status: | Merged |
---|---|
Merged at revision: | 6 |
Proposed branch: | lp:~lifeless/python-oops-amqp/0.0.4 |
Merge into: | lp:python-oops-amqp |
Diff against target: |
181 lines (+39/-12) 7 files modified
NEWS (+10/-0) oops_amqp/__init__.py (+1/-1) oops_amqp/publisher.py (+6/-4) oops_amqp/receiver.py (+4/-3) oops_amqp/tests/test_receiver.py (+2/-1) oops_amqp/utils.py (+15/-2) setup.py (+1/-1) |
To merge this branch: | bzr merge lp:~lifeless/python-oops-amqp/0.0.4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Steve Kowalik (community) | code | Approve | |
Review via email: mp+80865@code.launchpad.net |
Description of the change
More robustness discovered by observing repeated stop-start cycles of amqp2disk on carob. I've filed a bug about the basic_cancel blowing up upstream, but the guard isn't wrong, so there is no need to wait or fudge things.
The basic_cancel change is tested (see the stub change) but the new exception isn't, and is still nasty to try to do so.
To post a comment you must log in.
I'm not sure about the wisdom of importing tuples of exceptions to catch -- it strikes me as messy. However, I can't think of a better solution.