val
/
irctest
mirror of https://github.com/progval/irctest.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix client tests broken by 020564bdcb.

This commit is contained in:
Valentin Lorentz 2021-02-19 22:57:54 +01:00
parent c9c08c7f6f
commit 0dfe0de549
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
irctest/client_tests/test_cap.py
View File

@ -11,4 +11,4 @@ class CapTestCase(cases.BaseClientTestCase, cases.ClientNegociationHelper):
def testEmptyCapLs(self): def testEmptyCapLs(self):
"""Empty result to CAP LS. Client should send CAP END.""" """Empty result to CAP LS. Client should send CAP END."""
m = self.negotiateCapabilities([]) m = self.negotiateCapabilities([])
self.assertEqual(m, Message([], None, 'CAP', ['END'])) self.assertEqual(m, Message({}, None, 'CAP', ['END']))

36
irctest/client_tests/test_sasl.py
View File

@ -19,15 +19,15 @@ class SaslTestCase(cases.BaseClientTestCase, cases.ClientNegociationHelper,
password='sesame', password='sesame',
) )
m = self.negotiateCapabilities(['sasl'], auth=auth) m = self.negotiateCapabilities(['sasl'], auth=auth)
self.assertEqual(m, Message([], None, 'AUTHENTICATE', ['PLAIN'])) self.assertEqual(m, Message({}, None, 'AUTHENTICATE', ['PLAIN']))
self.sendLine('AUTHENTICATE +') self.sendLine('AUTHENTICATE +')
m = self.getMessage() m = self.getMessage()
self.assertEqual(m, Message([], None, 'AUTHENTICATE', self.assertEqual(m, Message({}, None, 'AUTHENTICATE',
['amlsbGVzAGppbGxlcwBzZXNhbWU='])) ['amlsbGVzAGppbGxlcwBzZXNhbWU=']))
self.sendLine('900 * * jilles :You are now logged in.') self.sendLine('900 * * jilles :You are now logged in.')
self.sendLine('903 * :SASL authentication successful') self.sendLine('903 * :SASL authentication successful')
m = self.negotiateCapabilities(['sasl'], False) m = self.negotiateCapabilities(['sasl'], False)
self.assertEqual(m, Message([], None, 'CAP', ['END'])) self.assertEqual(m, Message({}, None, 'CAP', ['END']))
@cases.OptionalityHelper.skipUnlessHasMechanism('PLAIN') @cases.OptionalityHelper.skipUnlessHasMechanism('PLAIN')
def testPlainNotAvailable(self): def testPlainNotAvailable(self):
@ -45,10 +45,10 @@ class SaslTestCase(cases.BaseClientTestCase, cases.ClientNegociationHelper,
) )
m = self.negotiateCapabilities(['sasl=EXTERNAL'], auth=auth) m = self.negotiateCapabilities(['sasl=EXTERNAL'], auth=auth)
self.assertEqual(self.acked_capabilities, {'sasl'}) self.assertEqual(self.acked_capabilities, {'sasl'})
if m == Message([], None, 'CAP', ['END']): if m == Message({}, None, 'CAP', ['END']):
# IRCv3.2-style # IRCv3.2-style
return return
self.assertEqual(m, Message([], None, 'AUTHENTICATE', ['PLAIN'])) self.assertEqual(m, Message({}, None, 'AUTHENTICATE', ['PLAIN']))
self.sendLine('904 {} :SASL auth failed'.format(self.nick)) self.sendLine('904 {} :SASL auth failed'.format(self.nick))
m = self.getMessage() m = self.getMessage()
self.assertMessageEqual(m, command='CAP') self.assertMessageEqual(m, command='CAP')
@ -69,21 +69,21 @@ class SaslTestCase(cases.BaseClientTestCase, cases.ClientNegociationHelper,
authstring = base64.b64encode(b'\x00'.join( authstring = base64.b64encode(b'\x00'.join(
[b'foo', b'foo', b'bar'*200])).decode() [b'foo', b'foo', b'bar'*200])).decode()
m = self.negotiateCapabilities(['sasl'], auth=auth) m = self.negotiateCapabilities(['sasl'], auth=auth)
self.assertEqual(m, Message([], None, 'AUTHENTICATE', ['PLAIN'])) self.assertEqual(m, Message({}, None, 'AUTHENTICATE', ['PLAIN']))
self.sendLine('AUTHENTICATE +') self.sendLine('AUTHENTICATE +')
m = self.getMessage() m = self.getMessage()
self.assertEqual(m, Message([], None, 'AUTHENTICATE', self.assertEqual(m, Message({}, None, 'AUTHENTICATE',
[authstring[0:400]]), m) [authstring[0:400]]), m)
m = self.getMessage() m = self.getMessage()
self.assertEqual(m, Message([], None, 'AUTHENTICATE', self.assertEqual(m, Message({}, None, 'AUTHENTICATE',
[authstring[400:800]])) [authstring[400:800]]))
m = self.getMessage() m = self.getMessage()
self.assertEqual(m, Message([], None, 'AUTHENTICATE', self.assertEqual(m, Message({}, None, 'AUTHENTICATE',
[authstring[800:]])) [authstring[800:]]))
self.sendLine('900 * * {} :You are now logged in.'.format('foo')) self.sendLine('900 * * {} :You are now logged in.'.format('foo'))
self.sendLine('903 * :SASL authentication successful') self.sendLine('903 * :SASL authentication successful')
m = self.negotiateCapabilities(['sasl'], False) m = self.negotiateCapabilities(['sasl'], False)
self.assertEqual(m, Message([], None, 'CAP', ['END'])) self.assertEqual(m, Message({}, None, 'CAP', ['END']))
@cases.OptionalityHelper.skipUnlessHasMechanism('PLAIN') @cases.OptionalityHelper.skipUnlessHasMechanism('PLAIN')
def testPlainLargeMultiple(self): def testPlainLargeMultiple(self):
@ -100,21 +100,21 @@ class SaslTestCase(cases.BaseClientTestCase, cases.ClientNegociationHelper,
authstring = base64.b64encode(b'\x00'.join( authstring = base64.b64encode(b'\x00'.join(
[b'foo', b'foo', b'quux'*148])).decode() [b'foo', b'foo', b'quux'*148])).decode()
m = self.negotiateCapabilities(['sasl'], auth=auth) m = self.negotiateCapabilities(['sasl'], auth=auth)
self.assertEqual(m, Message([], None, 'AUTHENTICATE', ['PLAIN'])) self.assertEqual(m, Message({}, None, 'AUTHENTICATE', ['PLAIN']))
self.sendLine('AUTHENTICATE +') self.sendLine('AUTHENTICATE +')
m = self.getMessage() m = self.getMessage()
self.assertEqual(m, Message([], None, 'AUTHENTICATE', self.assertEqual(m, Message({}, None, 'AUTHENTICATE',
[authstring[0:400]]), m) [authstring[0:400]]), m)
m = self.getMessage() m = self.getMessage()
self.assertEqual(m, Message([], None, 'AUTHENTICATE', self.assertEqual(m, Message({}, None, 'AUTHENTICATE',
[authstring[400:800]])) [authstring[400:800]]))
m = self.getMessage() m = self.getMessage()
self.assertEqual(m, Message([], None, 'AUTHENTICATE', self.assertEqual(m, Message({}, None, 'AUTHENTICATE',
['+'])) ['+']))
self.sendLine('900 * * {} :You are now logged in.'.format('foo')) self.sendLine('900 * * {} :You are now logged in.'.format('foo'))
self.sendLine('903 * :SASL authentication successful') self.sendLine('903 * :SASL authentication successful')
m = self.negotiateCapabilities(['sasl'], False) m = self.negotiateCapabilities(['sasl'], False)
self.assertEqual(m, Message([], None, 'CAP', ['END'])) self.assertEqual(m, Message({}, None, 'CAP', ['END']))
@cases.OptionalityHelper.skipUnlessHasMechanism('SCRAM-SHA-256') @cases.OptionalityHelper.skipUnlessHasMechanism('SCRAM-SHA-256')
def testScram(self): def testScram(self):
@ -132,7 +132,7 @@ class SaslTestCase(cases.BaseClientTestCase, cases.ClientNegociationHelper,
channel_binding=False, password_database=PasswdDb()) channel_binding=False, password_database=PasswdDb())
m = self.negotiateCapabilities(['sasl'], auth=auth) m = self.negotiateCapabilities(['sasl'], auth=auth)
self.assertEqual(m, Message([], None, 'AUTHENTICATE', ['SCRAM-SHA-256'])) self.assertEqual(m, Message({}, None, 'AUTHENTICATE', ['SCRAM-SHA-256']))
self.sendLine('AUTHENTICATE +') self.sendLine('AUTHENTICATE +')
m = self.getMessage() m = self.getMessage()
@ -168,7 +168,7 @@ class SaslTestCase(cases.BaseClientTestCase, cases.ClientNegociationHelper,
channel_binding=False, password_database=PasswdDb()) channel_binding=False, password_database=PasswdDb())
m = self.negotiateCapabilities(['sasl'], auth=auth) m = self.negotiateCapabilities(['sasl'], auth=auth)
self.assertEqual(m, Message([], None, 'AUTHENTICATE', ['SCRAM-SHA-256'])) self.assertEqual(m, Message({}, None, 'AUTHENTICATE', ['SCRAM-SHA-256']))
self.sendLine('AUTHENTICATE +') self.sendLine('AUTHENTICATE +')
m = self.getMessage() m = self.getMessage()
@ -198,4 +198,4 @@ class Irc302SaslTestCase(cases.BaseClientTestCase, cases.ClientNegociationHelper
) )
m = self.negotiateCapabilities(['sasl=EXTERNAL'], auth=auth) m = self.negotiateCapabilities(['sasl=EXTERNAL'], auth=auth)
self.assertEqual(self.acked_capabilities, {'sasl'}) self.assertEqual(self.acked_capabilities, {'sasl'})
self.assertEqual(m, Message([], None, 'CAP', ['END'])) self.assertEqual(m, Message({}, None, 'CAP', ['END']))