avoid calling config_logging in some tests

giampaolo · Jun 21, 2024 · 9aa0b28 · 9aa0b28
1 parent 682aa37
commit 9aa0b28
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pyftpdlib/test/test_cli.py b/pyftpdlib/test/test_cli.py
@@ -21,6 +21,7 @@
 from pyftpdlib.authorizers import DummyAuthorizer
 from pyftpdlib.servers import FTPServer
 from pyftpdlib.test import PyftpdlibTestCase
+from pyftpdlib.test import mock
 
 
 class TestCommandLineParser(PyftpdlibTestCase):
@@ -36,7 +37,6 @@ class DummyFTPServer(FTPServer):
 
             def serve_forever(self, *args, **kwargs):
                 self.close_all()
-                return
 
         if PY3:
             import io
@@ -45,10 +45,12 @@ def serve_forever(self, *args, **kwargs):
         else:
             self.devnull = BytesIO()
         self.original_ftpserver_class = FTPServer
+        self.clog = mock.patch("pyftpdlib.__main__.config_logging")
+        self.clog.start()
         pyftpdlib.__main__.FTPServer = DummyFTPServer
 
     def tearDown(self):
-        self.devnull.close()
+        self.clog.stop()
         pyftpdlib.servers.FTPServer = self.original_ftpserver_class
         super().tearDown()