From ade5a0245767c24ccd33b281f0a414809d60ec88 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sat, 31 Jul 2021 13:05:36 +0200 Subject: [PATCH] Fix/update SASL tests, broken by the previous commit. --- test/test_irclib.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/test/test_irclib.py b/test/test_irclib.py index e747a2312..b52a55038 100644 --- a/test/test_irclib.py +++ b/test/test_irclib.py @@ -1361,10 +1361,17 @@ class SaslTestCase(SupyTestCase, CapNegMixin): conf.supybot.networks.test.sasl.username.setValue('') conf.supybot.networks.test.sasl.password.setValue('') self.assertEqual(self.irc.sasl_current_mechanism, None) - self.assertEqual(self.irc.sasl_next_mechanisms, ['plain']) + self.assertEqual(self.irc.sasl_next_mechanisms, + ['scram-sha-256', 'plain']) self.startCapNegociation() + m = self.irc.takeMsg() + self.assertEqual(m, ircmsgs.IrcMsg(command='AUTHENTICATE', + args=('SCRAM-SHA-256',))) + self.irc.feedMsg(ircmsgs.IrcMsg(command='904', + args=('mechanism not available',))) + m = self.irc.takeMsg() self.assertEqual(m, ircmsgs.IrcMsg(command='AUTHENTICATE', args=('PLAIN',))) @@ -1392,14 +1399,19 @@ class SaslTestCase(SupyTestCase, CapNegMixin): conf.supybot.networks.test.certfile.setValue('') self.assertEqual(self.irc.sasl_current_mechanism, None) self.assertEqual(self.irc.sasl_next_mechanisms, - ['external', 'plain']) + ['scram-sha-256', 'external', 'plain']) self.startCapNegociation() m = self.irc.takeMsg() self.assertEqual(m, ircmsgs.IrcMsg(command='AUTHENTICATE', - args=('EXTERNAL',))) + args=('SCRAM-SHA-256',))) + self.irc.feedMsg(ircmsgs.IrcMsg(command='904', + args=('mechanism not available',))) + m = self.irc.takeMsg() + self.assertEqual(m, ircmsgs.IrcMsg(command='AUTHENTICATE', + args=('EXTERNAL',))) self.irc.feedMsg(ircmsgs.IrcMsg(command='904', args=('mechanism not available',))) @@ -1430,7 +1442,7 @@ class SaslTestCase(SupyTestCase, CapNegMixin): conf.supybot.networks.test.certfile.setValue('') self.assertEqual(self.irc.sasl_current_mechanism, None) self.assertEqual(self.irc.sasl_next_mechanisms, - ['external', 'plain']) + ['scram-sha-256', 'external', 'plain']) self.startCapNegociation(caps='sasl=foo,plain,bar') @@ -1458,7 +1470,8 @@ class SaslTestCase(SupyTestCase, CapNegMixin): conf.supybot.networks.test.sasl.username.setValue('') conf.supybot.networks.test.sasl.password.setValue('') self.assertEqual(self.irc.sasl_current_mechanism, None) - self.assertEqual(self.irc.sasl_next_mechanisms, ['plain']) + self.assertEqual(self.irc.sasl_next_mechanisms, + ['scram-sha-256', 'plain']) self.startCapNegociation(caps='')