skip with pytest marks instead of genutils decorators

Author: minrk

jupyter_client/tests/test_kernelmanager.py

@@ -13,13 +13,11 @@
 import time
 from unittest import TestCase
 
-from ipython_genutils.testing import decorators as dec
-
 from traitlets.config.loader import Config
 from jupyter_core import paths
 from jupyter_client import KernelManager
 from ..manager import start_new_kernel
-from .utils import test_env
+from .utils import test_env, skip_win32
 
 TIMEOUT = 30
 
@@ -67,7 +65,7 @@ def test_tcp_lifecycle(self):
         km = self._get_tcp_km()
         self._run_lifecycle(km)
 
-    @dec.skip_win32
+    @skip_win32
     def test_ipc_lifecycle(self):
         km = self._get_ipc_km()
         self._run_lifecycle(km)
@@ -82,8 +80,8 @@ def test_get_connect_info(self):
             'key', 'signature_scheme',
         ])
         self.assertEqual(keys, expected)
-    
-    @dec.skip_win32
+
+    @skip_win32
     def test_signal_kernel_subprocesses(self):
         self._install_test_kernel()
         km, kc = start_new_kernel(kernel_name='signaltest')

jupyter_client/tests/test_kernelspec.py

@@ -13,12 +13,13 @@
 import sys
 import unittest
 
+import pytest
+
 if str is bytes: # py2
     StringIO = io.BytesIO
 else:
     StringIO = io.StringIO
 
-from ipython_genutils.testing.decorators import onlyif
 from ipython_genutils.tempdir import TemporaryDirectory
 from jupyter_client import kernelspec
 from jupyter_core import paths
@@ -123,7 +124,9 @@ def test_install_kernel_spec_prefix(self):
         self.ksm.log.removeHandler(handler)
         self.assertNotIn("may not be found", captured)
 
-    @onlyif(os.name != 'nt' and not os.access('/usr/local/share', os.W_OK), "needs Unix system without root privileges")
+    @pytest.mark.skipif(
+        not (os.name != 'nt' and not os.access('/usr/local/share', os.W_OK)),
+        reason="needs Unix system without root privileges")
     def test_cant_install_kernel_spec(self):
         with self.assertRaises(OSError):
             self.ksm.install_kernel_spec(self.installable_kernel,

jupyter_client/tests/test_multikernelmanager.py

@@ -4,12 +4,11 @@
 import time
 from unittest import TestCase
 
-from ipython_genutils.testing import decorators as dec
-
 from traitlets.config.loader import Config
 from ..localinterfaces import localhost
 from jupyter_client import KernelManager
 from jupyter_client.multikernelmanager import MultiKernelManager
+from .utils import skip_win32
 
 class TestKernelManager(TestCase):
 
@@ -75,12 +74,12 @@ def test_tcp_cinfo(self):
         km = self._get_tcp_km()
         self._run_cinfo(km, 'tcp', localhost())
 
-    @dec.skip_win32
+    @skip_win32
     def test_ipc_lifecycle(self):
         km = self._get_ipc_km()
         self._run_lifecycle(km)
 
-    @dec.skip_win32
+    @skip_win32
     def test_ipc_cinfo(self):
         km = self._get_ipc_km()
         self._run_cinfo(km, 'ipc', 'test')

jupyter_client/tests/test_session.py

@@ -8,6 +8,8 @@
 import uuid
 from datetime import datetime
 
+import pytest
+
 import zmq
 
 from zmq.tests import BaseZMQTestCase
@@ -16,7 +18,6 @@
 from jupyter_client import session as ss
 from jupyter_client import jsonutil
 
-from ipython_genutils.testing.decorators import skipif, module_not_available
 from ipython_genutils.py3compat import string_types
 
 def _bad_packer(obj):
@@ -286,9 +287,8 @@ def test_datetimes_pickle(self):
         session = ss.Session(packer='pickle')
         self._datetime_test(session)
 
-    @skipif(module_not_available('msgpack'))
     def test_datetimes_msgpack(self):
-        import msgpack
+        msgpack = pytest.importorskip('msgpack')
 
         session = ss.Session(
             pack=msgpack.packb,

jupyter_client/tests/utils.py

@@ -3,13 +3,20 @@
 """
 import os
 pjoin = os.path.join
+import sys
 try:
     from unittest.mock import patch
 except ImportError:
     from mock import patch
 
+import pytest
+
 from ipython_genutils.tempdir import TemporaryDirectory
 
+
+skip_win32 = pytest.mark.skipif(sys.platform.startswith('win'), reason="Windows")
+
+
 class test_env(object):
     """Set Jupyter path variables to a temporary directory