From 1b72faef3c487232e519a3366db716f5a7e9226a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 24 Mar 2020 22:18:41 +0100
Subject: Update the tests to work with oragono

---
 tests/end_to_end/scenarios/leave_unjoined_chan.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'tests/end_to_end/scenarios/leave_unjoined_chan.py')

diff --git a/tests/end_to_end/scenarios/leave_unjoined_chan.py b/tests/end_to_end/scenarios/leave_unjoined_chan.py
index 445480b..aeb6f55 100644
--- a/tests/end_to_end/scenarios/leave_unjoined_chan.py
+++ b/tests/end_to_end/scenarios/leave_unjoined_chan.py
@@ -3,14 +3,12 @@ from scenarios import *
 scenario = (
     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_stanza("/message"),
-    expect_stanza("/presence"),
-    expect_stanza("/message"),
+    simple_channel_join.expect_self_join_presence(),
 
     send_stanza("<presence from='{jid_two}/{resource_two}' to='#foo%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
     sequences.connection_begin("irc.localhost", '{jid_two}/{resource_two}'),
 
-    expect_stanza("/message[@to='{jid_two}/{resource_two}'][@type='chat']/body[text()='irc.localhost: {nick_one}: Nickname is already in use.']"),
+    expect_stanza("/message[@to='{jid_two}/{resource_two}'][@type='chat']/body[text()='irc.localhost: {nick_one}: Nickname is already in use']"),
     expect_stanza("/presence[@type='error']/error[@type='cancel'][@code='409']/stanza:conflict"),
     send_stanza("<presence from='{jid_two}/{resource_two}' to='#foo%{irc_server_one}/{nick_one}' type='unavailable' />")
 )
-- 
cgit v1.2.3