summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2017-03-30 18:16:44 +0200
committerlouiz’ <louiz@louiz.org>2017-03-30 18:16:44 +0200
commit7f2127a7ea4c49fc1fbcd6cd6fb13e0265f4d841 (patch)
tree0b26c2742f00ac424bd19909695b24e6fd452d52 /tests
parent1090f3ceda3a4e87e592fa5aab33ce3e8fb05918 (diff)
downloadbiboumi-7f2127a7ea4c49fc1fbcd6cd6fb13e0265f4d841.tar.gz
biboumi-7f2127a7ea4c49fc1fbcd6cd6fb13e0265f4d841.tar.bz2
biboumi-7f2127a7ea4c49fc1fbcd6cd6fb13e0265f4d841.tar.xz
biboumi-7f2127a7ea4c49fc1fbcd6cd6fb13e0265f4d841.zip
Add the archive ID to messages when they are sent to users
This makes us compatible with mam 6.0 fix #3249
Diffstat (limited to 'tests')
-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 088be9c..fd833e2 100644
--- a/tests/end_to_end/__main__.py
+++ b/tests/end_to_end/__main__.py
@@ -132,7 +132,8 @@ def match(stanza, xpath):
'rsm': 'http://jabber.org/protocol/rsm',
'carbon': 'urn:xmpp:carbons:2',
'hints': 'urn:xmpp:hints',
- 'stanza': 'urn:ietf:params:xml:ns:xmpp-stanzas'})
+ 'stanza': 'urn:ietf:params:xml:ns:xmpp-stanzas',
+ 'stable_id': 'urn:xmpp:sid:0'})
return matched
@@ -1483,7 +1484,10 @@ if __name__ == '__main__':
# Send two channel messages
partial(send_stanza, "<message from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><body>coucou</body></message>"),
- partial(expect_stanza, "/message[@from='#foo%{irc_server_one}/{nick_one}'][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='coucou']"),
+ partial(expect_stanza,
+ ("/message[@from='#foo%{irc_server_one}/{nick_one}'][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='coucou']",
+ "/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]",)
+ ),
partial(send_stanza, "<message from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><body>coucou 2</body></message>"),
partial(expect_stanza, "/message[@from='#foo%{irc_server_one}/{nick_one}'][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='coucou 2']"),