Fix exception handling in testUntrustedCertificate on closed connection.

irctest/cases.py

@@ -98,7 +98,10 @@ class BaseClientTestCase(_IrcTestCase):
         self._setUpServer()
     def tearDown(self):
         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()
         if self.conn:
             self.conn_file.close()

irctest/client_tests/test_tls.py

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

irctest/controllers/limnoria.py

@@ -62,7 +62,8 @@ class LimnoriaController(BaseClientController, DirectoryBasedController):
                 trusted_fingerprints=' '.join(tls_config.trusted_fingerprints) if tls_config else '',
                 ))
         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():
     return LimnoriaController