val/irctest
1
0
Fork 0
mirror of https://github.com/progval/irctest.git synced 2025-04-05 14:59:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix exception handling in testUntrustedCertificate on closed connection.

Browse Source
This commit is contained in:
Valentin Lorentz
2019-10-22 18:28:39 +02:00
parent 19a0623e91
commit 857e8d195e
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
irctest/cases.py
View File

@ -98,7 +98,10 @@ class BaseClientTestCase(_IrcTestCase):
self._setUpServer() self._setUpServer()
def tearDown(self): def tearDown(self):
if self.conn: if self.conn:
self.conn.sendall(b'QUIT :end of test.') try:
self.conn.sendall(b'QUIT :end of test.')
except BrokenPipeError:
pass # client disconnected before we did
self.controller.kill() self.controller.kill()
if self.conn: if self.conn:
self.conn_file.close() self.conn_file.close()

2
irctest/client_tests/test_tls.py
View File

@ -139,5 +139,5 @@ class TlsTestCase(cases.BaseClientTestCase):
tls_config=tls_config, tls_config=tls_config,
) )
self.acceptClient(tls_cert=BAD_CERT, tls_key=BAD_KEY) self.acceptClient(tls_cert=BAD_CERT, tls_key=BAD_KEY)
with self.assertRaises(ConnectionClosed): with self.assertRaises((ConnectionClosed, ConnectionResetError)):
m = self.getMessage() m = self.getMessage()

3
irctest/controllers/limnoria.py
View File

@ -62,7 +62,8 @@ class LimnoriaController(BaseClientController, DirectoryBasedController):
trusted_fingerprints=' '.join(tls_config.trusted_fingerprints) if tls_config else '', trusted_fingerprints=' '.join(tls_config.trusted_fingerprints) if tls_config else '',
)) ))
self.proc = subprocess.Popen(['supybot', self.proc = subprocess.Popen(['supybot',
os.path.join(self.directory, 'bot.conf')]) os.path.join(self.directory, 'bot.conf')],
stderr=subprocess.STDOUT)
def get_irctest_controller_class(): def get_irctest_controller_class():
return LimnoriaController return LimnoriaController