diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2012-05-04 15:39:19 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2012-05-04 15:39:19 +0000 |
| commit | 633c33f224f3196f3f9bd80bd2e418d8143fea06 (patch) | |
| tree | 1391da89470593209466df68c0b40b89c14963b1 /python/qpid/tests | |
| parent | c73f9286ebff93a6c8dbc29cf05e258c4b55c976 (diff) | |
| download | qpid-python-633c33f224f3196f3f9bd80bd2e418d8143fea06.tar.gz | |
QPID-3858: Updated branch - merged from trunk r.1333987
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1334037 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/qpid/tests')
| -rw-r--r-- | python/qpid/tests/messaging/endpoints.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/python/qpid/tests/messaging/endpoints.py b/python/qpid/tests/messaging/endpoints.py index db5ec03df2..62deacd0bd 100644 --- a/python/qpid/tests/messaging/endpoints.py +++ b/python/qpid/tests/messaging/endpoints.py @@ -524,7 +524,7 @@ class SessionTests(Base): self.ssn.acknowledge(echos[0]) self.ssn.acknowledge(echos[1], Disposition(REJECTED)) self.ssn.acknowledge(echos[2], - Disposition(REJECTED, code=3, text="test-reject")) + Disposition(REJECTED, code=0, text="test-reject")) self.drain(rej, expected=msgs[1:]) self.ssn.acknowledge() @@ -632,9 +632,9 @@ class SessionTests(Base): def testDoubleCommit(self): ssn = self.conn.session(transactional=True) - snd = ssn.sender("amq.direct") - rcv = ssn.receiver("amq.direct") - msgs = [self.message("testDoubleCommit", i) for i in range(3)] + snd = ssn.sender("amq.direct/doubleCommit") + rcv = ssn.receiver("amq.direct/doubleCommit") + msgs = [self.message("testDoubleCommit", i, subject="doubleCommit") for i in range(3)] for m in msgs: snd.send(m) ssn.commit() @@ -1038,7 +1038,7 @@ class AddressTests(Base): snd.close() assert False, "successfully deleted amq.topic" except SessionError, e: - assert "Cannot delete default exchange" in str(e) + assert e.code == 530 # XXX: need to figure out close after error self.conn._remove_session(self.ssn) |