summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-10-12 20:59:37 +0200
committerlouiz’ <louiz@louiz.org>2016-10-12 21:00:05 +0200
commit44f35a256dd7fc3238ae81f9bd42a42c013dba90 (patch)
tree23bfaf53bd3836add2eb346c9a94990202efccb5
parentc3a7cd36279a123feec6d3665a4ba64b7ac1866b (diff)
downloadbiboumi-44f35a256dd7fc3238ae81f9bd42a42c013dba90.tar.gz
biboumi-44f35a256dd7fc3238ae81f9bd42a42c013dba90.tar.bz2
biboumi-44f35a256dd7fc3238ae81f9bd42a42c013dba90.tar.xz
biboumi-44f35a256dd7fc3238ae81f9bd42a42c013dba90.zip
e2e: test the private and no-copy thingy
-rw-r--r--tests/end_to_end/__main__.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py
index 1218c89..9cad963 100644
--- a/tests/end_to_end/__main__.py
+++ b/tests/end_to_end/__main__.py
@@ -121,7 +121,9 @@ def match(stanza, xpath):
'delay': 'urn:xmpp:delay',
'forward': 'urn:xmpp:forward:0',
'client': 'jabber:client',
- 'rsm': 'http://jabber.org/protocol/rsm'})
+ 'rsm': 'http://jabber.org/protocol/rsm',
+ 'carbon': 'urn:xmpp:carbons:2',
+ 'hints': 'urn:xmpp:hints'})
return matched
@@ -691,7 +693,9 @@ if __name__ == '__main__':
# That second user sends a private message to the first one
partial(send_stanza, "<message from='{jid_two}/{resource_one}' to='#foo%{irc_server_one}/{nick_one}' type='chat'><body>RELLO</body></message>"),
# Message is received with a server-wide JID, by the two resources behind nick_one
- partial(expect_stanza, "/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_one}'][@type='chat']/body[text()='RELLO']"),
+ partial(expect_stanza, ("/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_one}'][@type='chat']/body[text()='RELLO']",
+ "/message/hints:no-copy",
+ "/message/carbon:private")),
partial(expect_stanza, "/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_two}'][@type='chat']/body[text()='RELLO']"),
# One resource leaves the server entirely.