diff options
Diffstat (limited to 'tests/end_to_end/scenarios/simple_channel_join.py')
| -rw-r--r-- | tests/end_to_end/scenarios/simple_channel_join.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/end_to_end/scenarios/simple_channel_join.py b/tests/end_to_end/scenarios/simple_channel_join.py index b09d6be..6b57207 100644 --- a/tests/end_to_end/scenarios/simple_channel_join.py +++ b/tests/end_to_end/scenarios/simple_channel_join.py @@ -1,8 +1,7 @@ from scenarios import * -def expect_self_join_presence(jid, chan, nick, irc_server="{irc_server_one}"): +def expect_self_join_presence(jid='{jid_one}/{resource_one}', chan='#foo', nick='{nick_one}', irc_server="{irc_server_one}"): return ( - expect_stanza("/message/body[text()='Mode " + chan + " [+nt] by irc.localhost']"), expect_stanza("/presence[@to='" + jid +"'][@from='" + chan + "%" + irc_server + "/" + nick + "']/muc_user:x/muc_user:item[@affiliation='admin'][@role='moderator']", "/presence/muc_user:x/muc_user:status[@code='100']", # Rooms are all non-anonymous "/presence/muc_user:x/muc_user:status[@code='110']", @@ -12,10 +11,9 @@ def expect_self_join_presence(jid, chan, nick, irc_server="{irc_server_one}"): 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(), expect_self_join_presence(jid = '{jid_one}/{resource_one}', chan = "#foo", nick = "{nick_one}"), - ) |