skip multiprocess tests on osx

giampaolo · Jun 23, 2024 · e85af60 · e85af60
1 parent 2e40334
commit e85af60
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pyftpdlib/ioloop.py b/pyftpdlib/ioloop.py
@@ -671,11 +671,11 @@ def close(self):
 
 # ===================================================================
 # --- kqueue() - BSD / OSX
-# XXX: disabled as it got broke at some point
 # ===================================================================
 
-# if hasattr(select, 'kqueue'):  # pragma: no cover
-if False:  # noqa
+# XXX: disabled as it got broke at some point
+'''
+if hasattr(select, 'kqueue'):  # pragma: no cover
 
     class Kqueue(_IOLoop):
         """kqueue() based poller."""
@@ -788,6 +788,7 @@ def poll(
                             _write(inst)
                 if kevent.flags & _ERROR:
                     inst.handle_close()
+'''
 
 
 # ===================================================================
@@ -797,8 +798,7 @@ def poll(
 if hasattr(select, 'epoll'):  # epoll() - Linux
     IOLoop = Epoll
 # elif hasattr(select, 'kqueue'):  # kqueue() - BSD / OSX
-if False:  # XXX: disabled as it got broken
-    IOLoop = Kqueue
+#     IOLoop = Kqueue
 elif hasattr(select, 'devpoll'):  # /dev/poll - Solaris
     IOLoop = DevPoll
 elif hasattr(select, 'poll'):  # poll() - POSIX

diff --git a/pyftpdlib/test/test_servers.py b/pyftpdlib/test/test_servers.py
@@ -11,8 +11,10 @@
 from pyftpdlib import handlers
 from pyftpdlib import servers
 from pyftpdlib._compat import super
+from pyftpdlib.test import GITHUB_ACTIONS
 from pyftpdlib.test import GLOBAL_TIMEOUT
 from pyftpdlib.test import HOST
+from pyftpdlib.test import OSX
 from pyftpdlib.test import PASSWD
 from pyftpdlib.test import USER
 from pyftpdlib.test import WINDOWS
@@ -160,6 +162,7 @@ class TestCornerCasesThreadMixin(ThreadFTPTestMixin, TestCornerCases):
     class MultiProcFTPd(ThreadedTestFTPd):
         server_class = servers.MultiprocessFTPServer
 
+    @pytest.mark.skipif(OSX and GITHUB_ACTIONS, reason="broken on OSX + CI")
     class MProcFTPTestMixin:
         server_class = MultiProcFTPd