summaryrefslogtreecommitdiff
path: root/tests/end_to_end/scenarios/channel_join_with_different_nick.py
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2020-03-11 18:41:43 +0100
committerlouiz’ <louiz@louiz.org>2020-03-11 18:41:43 +0100
commit212e8e59897c65e50f9d89949824a32d383201f4 (patch)
tree6c8628cb616ff7977176ee2316f115fa5cc2a9d9 /tests/end_to_end/scenarios/channel_join_with_different_nick.py
parenta0d24b48471e5307fda077a11491a3c44cbbdfaf (diff)
parent470ba2e4e486d922b2585219b790371ec7df934a (diff)
downloadbiboumi-212e8e59897c65e50f9d89949824a32d383201f4.tar.gz
biboumi-212e8e59897c65e50f9d89949824a32d383201f4.tar.bz2
biboumi-212e8e59897c65e50f9d89949824a32d383201f4.tar.xz
biboumi-212e8e59897c65e50f9d89949824a32d383201f4.zip
Merge remote-tracking branch 'linkmauve/die-gc1.0-die'
Diffstat (limited to 'tests/end_to_end/scenarios/channel_join_with_different_nick.py')
-rw-r--r--tests/end_to_end/scenarios/channel_join_with_different_nick.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/end_to_end/scenarios/channel_join_with_different_nick.py b/tests/end_to_end/scenarios/channel_join_with_different_nick.py
index 87ae80c..c499184 100644
--- a/tests/end_to_end/scenarios/channel_join_with_different_nick.py
+++ b/tests/end_to_end/scenarios/channel_join_with_different_nick.py
@@ -3,17 +3,16 @@ from scenarios import *
from scenarios.simple_channel_join import expect_self_join_presence
scenario = (
- send_stanza("<presence from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}/{nick_one}' />"),
+ send_stanza("<presence from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
sequences.connection("irc.localhost", '{jid_one}/{resource_one}'),
expect_self_join_presence(jid = '{jid_one}/{resource_one}', chan = "#foo", nick = "{nick_one}"),
# The same resource joins a different channel with a different nick
- send_stanza("<presence from='{jid_one}/{resource_one}' to='#bar%{irc_server_one}/{nick_two}' />"),
+ send_stanza("<presence from='{jid_one}/{resource_one}' to='#bar%{irc_server_one}/{nick_two}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
# We must receive a join presence in response, without any nick change (nick_two) must be ignored
expect_self_join_presence(jid = '{jid_one}/{resource_one}', chan = "#bar", nick = "{nick_one}"),
-
# An different resource joins the same channel, with a different nick
- send_stanza("<presence from='{jid_one}/{resource_two}' to='#foo%{irc_server_one}/{nick_two}' />"),
+ send_stanza("<presence from='{jid_one}/{resource_two}' to='#foo%{irc_server_one}/{nick_two}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
# We must receive a join presence in response, without any nick change (nick_two) must be ignored
expect_stanza("/presence[@to='{jid_one}/{resource_two}'][@from='#foo%{irc_server_one}/{nick_one}']"),
expect_stanza("/message/subject"),