summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2011-04-26 16:48:31 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-04-26 16:48:31 +0100
commite10e3222ce63c0316709bffd4972479f5d1ae65f (patch)
tree27532fa2848a81815b56f2730cf44556485a7fb3
parent6e98f6603c150c5655683de6076c0e8f39099c02 (diff)
message.py: make test stricter given error type changes
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rwxr-xr-xtests/twisted/salut/message.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/twisted/salut/message.py b/tests/twisted/salut/message.py
index 485cf08..f35a2be 100755
--- a/tests/twisted/salut/message.py
+++ b/tests/twisted/salut/message.py
@@ -126,7 +126,8 @@ def outgoing_fail(q, bus, conn):
reply['id'] = stanza['id']
error = reply.addElement('error')
error['type'] = 'cancel'
- error.addElement((ns.STANZA, 'cancel'))
+ error['code'] = '409'
+ error.addElement((ns.STANZA, 'conflict'))
error.addElement((ycs.MESSAGE_NS, 'yodawg'))
text = error.addElement((ns.STANZA, 'text'),
content='imma let you finish')
@@ -136,7 +137,7 @@ def outgoing_fail(q, bus, conn):
e = q.expect('dbus-signal', signal='Failed', path=path)
error_type, stanza_error_name, yst_error_name, text = e.args
assertEquals(ycs.ERROR_TYPE_CANCEL, error_type)
- assertEquals('cancel', stanza_error_name)
+ assertEquals('conflict', stanza_error_name)
assertEquals('yodawg', yst_error_name)
assertEquals('imma let you finish', text)