Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-26 12:49:24 +01:00
Code Issues Projects Releases Wiki Activity

SaslTestCase: Use tearDown() method instead of finally: blocks

Browse Source 
It's much cleaner
This commit is contained in:
Valentin Lorentz 2023-09-05 08:28:44 +02:00 committed by Val Lorentz
parent f8dd8d7642
commit 81a5133c14
1 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/test_irclib.py
View File

@ -1496,14 +1496,17 @@ class SaslTestCase(SupyTestCase, CapNegMixin):
def setUp(self): def setUp(self):
pass pass
def testPlain(self): def tearDown(self):
try:
conf.supybot.networks.test.sasl.username.setValue('jilles')
conf.supybot.networks.test.sasl.password.setValue('sesame')
self.irc = irclib.Irc('test')
finally:
conf.supybot.networks.test.sasl.username.setValue('') conf.supybot.networks.test.sasl.username.setValue('')
conf.supybot.networks.test.sasl.password.setValue('') conf.supybot.networks.test.sasl.password.setValue('')
conf.supybot.networks.test.certfile.setValue('')
def testPlain(self):
conf.supybot.networks.test.sasl.username.setValue('jilles')
conf.supybot.networks.test.sasl.password.setValue('sesame')
self.irc = irclib.Irc('test')
self.assertEqual(self.irc.sasl_current_mechanism, None) self.assertEqual(self.irc.sasl_current_mechanism, None)
self.irc.sasl_next_mechanisms = ['scram-sha-256', 'plain'] self.irc.sasl_next_mechanisms = ['scram-sha-256', 'plain']
@ -1531,15 +1534,12 @@ class SaslTestCase(SupyTestCase, CapNegMixin):
self.endCapNegociation() self.endCapNegociation()
def testExternalFallbackToPlain(self): def testExternalFallbackToPlain(self):
try:
conf.supybot.networks.test.sasl.username.setValue('jilles') conf.supybot.networks.test.sasl.username.setValue('jilles')
conf.supybot.networks.test.sasl.password.setValue('sesame') conf.supybot.networks.test.sasl.password.setValue('sesame')
conf.supybot.networks.test.certfile.setValue('foo') conf.supybot.networks.test.certfile.setValue('foo')
self.irc = irclib.Irc('test') self.irc = irclib.Irc('test')
finally:
conf.supybot.networks.test.sasl.username.setValue('')
conf.supybot.networks.test.sasl.password.setValue('')
conf.supybot.networks.test.certfile.setValue('')
self.assertEqual(self.irc.sasl_current_mechanism, None) self.assertEqual(self.irc.sasl_current_mechanism, None)
self.irc.sasl_next_mechanisms = ['external', 'plain'] self.irc.sasl_next_mechanisms = ['external', 'plain']
@ -1567,15 +1567,12 @@ class SaslTestCase(SupyTestCase, CapNegMixin):
self.endCapNegociation() self.endCapNegociation()
def testFilter(self): def testFilter(self):
try:
conf.supybot.networks.test.sasl.username.setValue('jilles') conf.supybot.networks.test.sasl.username.setValue('jilles')
conf.supybot.networks.test.sasl.password.setValue('sesame') conf.supybot.networks.test.sasl.password.setValue('sesame')
conf.supybot.networks.test.certfile.setValue('foo') conf.supybot.networks.test.certfile.setValue('foo')
self.irc = irclib.Irc('test') self.irc = irclib.Irc('test')
finally:
conf.supybot.networks.test.sasl.username.setValue('')
conf.supybot.networks.test.sasl.password.setValue('')
conf.supybot.networks.test.certfile.setValue('')
self.assertEqual(self.irc.sasl_current_mechanism, None) self.assertEqual(self.irc.sasl_current_mechanism, None)
self.irc.sasl_next_mechanisms = ['external', 'plain'] self.irc.sasl_next_mechanisms = ['external', 'plain']
@ -1597,13 +1594,11 @@ class SaslTestCase(SupyTestCase, CapNegMixin):
self.endCapNegociation() self.endCapNegociation()
def testReauthenticate(self): def testReauthenticate(self):
try:
conf.supybot.networks.test.sasl.username.setValue('jilles') conf.supybot.networks.test.sasl.username.setValue('jilles')
conf.supybot.networks.test.sasl.password.setValue('sesame') conf.supybot.networks.test.sasl.password.setValue('sesame')
self.irc = irclib.Irc('test') self.irc = irclib.Irc('test')
finally:
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_current_mechanism, None)
self.irc.sasl_next_mechanisms = ['plain'] self.irc.sasl_next_mechanisms = ['plain']
@ -1622,16 +1617,12 @@ class SaslTestCase(SupyTestCase, CapNegMixin):
self.irc.takeMsg() # None. But even if it was CAP REQ sasl, it would be ok self.irc.takeMsg() # None. But even if it was CAP REQ sasl, it would be ok
self.assertEqual(self.irc.takeMsg(), None) self.assertEqual(self.irc.takeMsg(), None)
try:
conf.supybot.networks.test.sasl.username.setValue('jilles') conf.supybot.networks.test.sasl.username.setValue('jilles')
conf.supybot.networks.test.sasl.password.setValue('sesame') conf.supybot.networks.test.sasl.password.setValue('sesame')
self.irc.feedMsg(ircmsgs.IrcMsg(command='CAP', self.irc.feedMsg(ircmsgs.IrcMsg(command='CAP',
args=('*', 'DEL', 'sasl'))) args=('*', 'DEL', 'sasl')))
self.irc.feedMsg(ircmsgs.IrcMsg(command='CAP', self.irc.feedMsg(ircmsgs.IrcMsg(command='CAP',
args=('*', 'NEW', 'sasl=PLAIN'))) args=('*', 'NEW', 'sasl=PLAIN')))
finally:
conf.supybot.networks.test.sasl.username.setValue('')
conf.supybot.networks.test.sasl.password.setValue('')
m = self.irc.takeMsg() m = self.irc.takeMsg()
self.assertEqual(m.command, 'CAP', 'Expected CAP, got %r.' % m) self.assertEqual(m.command, 'CAP', 'Expected CAP, got %r.' % m)