From fdc6d84a32e87c3486ac99b7aee282153d65b23e Mon Sep 17 00:00:00 2001 From: dequis Date: Fri, 9 Oct 2015 03:52:25 -0300 Subject: skype tests: adjust channel length limit to fix tests... The diff might look confusing - it's just removing the last hex digit of each channel name in the groupchat tests. This broke in several ways over the years. I know because i've been bisecting the last few hours and found lots of different issues. All of them except this one were fixed already This one is probably a side effect of the new irc channel name generation code that includes the # as part of the string and reuses the nick code. Or maybe not exactly that, but something similar. I'm not going to bisect any further, had enough for today. --- protocols/skype/t/groupchat-invite-bitlbee.mock | 6 +++--- protocols/skype/t/groupchat-invited-bitlbee.mock | 4 ++-- protocols/skype/t/groupchat-leave-bitlbee.mock | 6 +++--- protocols/skype/t/groupchat-msg-bitlbee.mock | 6 +++--- protocols/skype/t/groupchat-topic-bitlbee.mock | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'protocols') diff --git a/protocols/skype/t/groupchat-invite-bitlbee.mock b/protocols/skype/t/groupchat-invite-bitlbee.mock index bbc480f2..bee689f1 100644 --- a/protocols/skype/t/groupchat-invite-bitlbee.mock +++ b/protocols/skype/t/groupchat-invite-bitlbee.mock @@ -6,6 +6,6 @@ << PRIVMSG &bitlbee :account skype on >> :bob!bob@skype.com JOIN :&bitlbee << PRIVMSG &bitlbee :chat with bob ->> 353 alice = ##alice/$bob;a7ab206ec780 :@alice bob @root -<< INVITE cecil ##alice/$bob;a7ab206ec780 ->> cecil@skype.com JOIN :##alice/$bob;a7ab206ec780 +>> 353 alice = ##alice/$bob;a7ab206ec78 :@alice bob @root +<< INVITE cecil ##alice/$bob;a7ab206ec78 +>> cecil@skype.com JOIN :##alice/$bob;a7ab206ec78 diff --git a/protocols/skype/t/groupchat-invited-bitlbee.mock b/protocols/skype/t/groupchat-invited-bitlbee.mock index 42cc81b0..bf950774 100644 --- a/protocols/skype/t/groupchat-invited-bitlbee.mock +++ b/protocols/skype/t/groupchat-invited-bitlbee.mock @@ -4,5 +4,5 @@ >> PRIVMSG &bitlbee << PRIVMSG &bitlbee :account add skype alice foo << PRIVMSG &bitlbee :account skype on ->> JOIN :##cecil/$bob;4d8cc9965791 ->> 353 alice = ##cecil/$bob;4d8cc9965791 :@alice bob cecil @root +>> JOIN :##cecil/$bob;4d8cc996579 +>> 353 alice = ##cecil/$bob;4d8cc996579 :@alice bob cecil @root diff --git a/protocols/skype/t/groupchat-leave-bitlbee.mock b/protocols/skype/t/groupchat-leave-bitlbee.mock index 6b1e8337..fefe54c0 100644 --- a/protocols/skype/t/groupchat-leave-bitlbee.mock +++ b/protocols/skype/t/groupchat-leave-bitlbee.mock @@ -5,7 +5,7 @@ << PRIVMSG &bitlbee :account add skype alice foo << PRIVMSG &bitlbee :account skype set skypeconsole_receive true << PRIVMSG &bitlbee :account skype on ->> JOIN :##cecil/$bob;4d8cc9965791 ->> 353 alice = ##cecil/$bob;4d8cc9965791 :@alice bob cecil @root -<< PART ##cecil/$bob;4d8cc9965791 +>> JOIN :##cecil/$bob;4d8cc996579 +>> 353 alice = ##cecil/$bob;4d8cc996579 :@alice bob cecil @root +<< PART ##cecil/$bob;4d8cc996579 >> PRIVMSG &bitlbee :alice: CHAT #cecil/$bob;4d8cc9965791c6b9 STATUS UNSUBSCRIBED diff --git a/protocols/skype/t/groupchat-msg-bitlbee.mock b/protocols/skype/t/groupchat-msg-bitlbee.mock index 01556960..eae6d6e9 100644 --- a/protocols/skype/t/groupchat-msg-bitlbee.mock +++ b/protocols/skype/t/groupchat-msg-bitlbee.mock @@ -5,7 +5,7 @@ << PRIVMSG &bitlbee :account add skype alice foo << PRIVMSG &bitlbee :account skype set skypeconsole_receive true << PRIVMSG &bitlbee :account skype on ->> JOIN :##cecil/$bob;4d8cc9965791 ->> 353 alice = ##cecil/$bob;4d8cc9965791 :@alice bob cecil @root -<< PRIVMSG ##cecil/$bob;4d8cc9965791 :hello +>> JOIN :##cecil/$bob;4d8cc996579 +>> 353 alice = ##cecil/$bob;4d8cc996579 :@alice bob cecil @root +<< PRIVMSG ##cecil/$bob;4d8cc996579 :hello >> PRIVMSG &bitlbee :alice: CHAT #cecil/$bob;4d8cc9965791c6b9 ACTIVITY_TIMESTAMP diff --git a/protocols/skype/t/groupchat-topic-bitlbee.mock b/protocols/skype/t/groupchat-topic-bitlbee.mock index 5f190c14..431493c9 100644 --- a/protocols/skype/t/groupchat-topic-bitlbee.mock +++ b/protocols/skype/t/groupchat-topic-bitlbee.mock @@ -4,7 +4,7 @@ >> PRIVMSG &bitlbee << PRIVMSG &bitlbee :account add skype alice foo << PRIVMSG &bitlbee :account skype on ->> JOIN :##cecil/$bob;4d8cc9965791 ->> 353 alice = ##cecil/$bob;4d8cc9965791 :@alice bob cecil @root -<< TOPIC ##cecil/$bob;4d8cc9965791 :topic ->> TOPIC ##cecil/$bob;4d8cc9965791 :topic +>> JOIN :##cecil/$bob;4d8cc996579 +>> 353 alice = ##cecil/$bob;4d8cc996579 :@alice bob cecil @root +<< TOPIC ##cecil/$bob;4d8cc996579 :topic +>> TOPIC ##cecil/$bob;4d8cc996579 :topic -- cgit v1.2.3