Use py.test

Author: ask

.gitignore

@@ -17,8 +17,10 @@ devdatabase.db
 bundle_version.gen
 celeryd.log
 celeryd.pid
-nosetests.xml
 coverage.xml
 cover/
 *.so
 .tox/
+.eggs/
+htmlcov/
+.cache/

MANIFEST.in

@@ -8,3 +8,9 @@ recursive-include Doc  *.rst *.py
 recursive-include funtests *.py
 recursive-include requirements *.txt
 recursive-include billiard *.py
+recursive-include t *.py
+
+recursive-exclude docs/_build *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
+recursive-exclude * .*.sw*

billiard/tests/case.py

@@ -1 +1 @@
-coverage>=3.0
+pytest-cov

billiard/tests/test_package.py

@@ -1 +1,2 @@
-case>=1.2.2
+case>=1.3.1
+pytest>=3.0

billiard/tests/test_win32.py

@@ -1,2 +1,4 @@
-[nosetests]
-where = billiard/tests
+[tool:pytest]
+testpaths = t/unit/
+python_classes = test_*
+

requirements/test-ci.txt

@@ -4,10 +4,9 @@
 import sys
 import glob
 
-try:
-    from setuptools import setup, Extension, find_packages
-except ImportError:
-    from distutils.core import setup, Extension, find_packages  # noqa
+import setuptools
+import setuptools.command.test
+
 from distutils import sysconfig
 from distutils.errors import (
     CCompilerError,
@@ -99,15 +98,15 @@ def add_doc(m):
         HAVE_SEM_TIMEDWAIT=0,
         HAVE_FD_TRANSFER=1,
         HAVE_BROKEN_SEM_GETVALUE=1
-        )
+    )
     libraries = []
 elif sys.platform.startswith('cygwin'):  # Cygwin
     macros = dict(
         HAVE_SEM_OPEN=1,
         HAVE_SEM_TIMEDWAIT=1,
         HAVE_FD_TRANSFER=0,
         HAVE_BROKEN_SEM_UNLINK=1
-        )
+    )
     libraries = []
 elif sys.platform in ('freebsd4', 'freebsd5', 'freebsd6'):
     # FreeBSD's P1003.1b semaphore support is very experimental
@@ -116,7 +115,7 @@ def add_doc(m):
         HAVE_SEM_OPEN=0,
         HAVE_SEM_TIMEDWAIT=0,
         HAVE_FD_TRANSFER=1,
-        )
+    )
     libraries = []
 elif re.match('^(gnukfreebsd(8|9|10|11)|freebsd(7|8|9|0))', sys.platform):
     macros = dict(                  # FreeBSD 7+ and GNU/kFreeBSD 8+
@@ -191,11 +190,23 @@ def _is_build_command(argv=sys.argv, cmds=('install', 'build', 'bdist')):
             return arg
 
 
+class pytest(setuptools.command.test.test):
+    user_options = [('pytest-args=', 'a', 'Arguments to pass to py.test')]
+
+    def initialize_options(self):
+        setuptools.command.test.test.initialize_options(self)
+        self.pytest_args = []
+
+    def run_tests(self):
+        import pytest
+        sys.exit(pytest.main(self.pytest_args))
+
+
 def run_setup(with_extensions=True):
     extensions = []
     if with_extensions:
         extensions = [
-            Extension(
+            setuptools.Extension(
                 '_billiard',
                 sources=multiprocessing_srcs,
                 define_macros=macros.items(),
@@ -206,7 +217,7 @@ def run_setup(with_extensions=True):
         ]
         if sys.platform == 'win32':
             extensions.append(
-                Extension(
+                setuptools.Extension(
                     '_winapi',
                     sources=multiprocessing_srcs,
                     define_macros=macros.items(),
@@ -215,10 +226,8 @@ def run_setup(with_extensions=True):
                     depends=glob.glob('Modules/_billiard/*.h') + ['setup.py'],
                 ),
             )
-    packages = find_packages(exclude=[
-        'ez_setup', 'tests', 'funtests.*', 'tests.*',
-    ])
-    setup(
+    packages = setuptools.find_packages(exclude=['ez_setup', 't', 't.*'])
+    setuptools.setup(
         name='billiard',
         version=meta['VERSION'],
         description=meta['doc'],
@@ -233,7 +242,7 @@ def run_setup(with_extensions=True):
         zip_safe=False,
         license='BSD',
         tests_require=reqs('test.txt'),
-        test_suite='nose.collector',
+        cmdclass={'test': pytest},
         classifiers=[
             'Development Status :: 5 - Production/Stable',
             'Intended Audience :: Developers',

requirements/test.txt

@@ -1,19 +1,20 @@
 from __future__ import absolute_import
 
 import os
+import pytest
 import signal
 
 from contextlib import contextmanager
 from time import time
 
+from case import Mock, call, patch, skip
+
 from billiard.common import (
     _shutdown_cleanup,
     reset_signals,
     restart_state,
 )
 
-from .case import Case, Mock, call, patch, skip
-
 
 def signo(name):
     return getattr(signal, name)
@@ -31,13 +32,13 @@ def termsigs(default, full):
 
 
 @skip.if_win32()
-class test_reset_signals(Case):
+class test_reset_signals:
 
     def test_shutdown_handler(self):
         with patch('sys.exit') as exit:
             _shutdown_cleanup(15, Mock())
             exit.assert_called()
-            self.assertEqual(os.WTERMSIG(exit.call_args[0][0]), 15)
+            assert os.WTERMSIG(exit.call_args[0][0]) == 15
 
     def test_does_not_reset_ignored_signal(self, sigs=['SIGTERM']):
         with self.assert_context(sigs, [], signal.SIG_IGN) as (_, SET):
@@ -79,20 +80,20 @@ def assert_context(self, default, full, get_returns=None, set_effect=None):
                     yield GET, SET
 
 
-class test_restart_state(Case):
+class test_restart_state:
 
     def test_raises(self):
         s = restart_state(100, 1)  # max 100 restarts in 1 second.
         s.R = 99
         s.step()
-        with self.assertRaises(s.RestartFreqExceeded):
+        with pytest.raises(s.RestartFreqExceeded):
             s.step()
 
     def test_time_passed_resets_counter(self):
         s = restart_state(100, 10)
         s.R, s.T = 100, time()
-        with self.assertRaises(s.RestartFreqExceeded):
+        with pytest.raises(s.RestartFreqExceeded):
             s.step()
         s.R, s.T = 100, time()
         s.step(time() + 20)
-        self.assertEqual(s.R, 1)
+        assert s.R == 1

setup.cfg

@@ -0,0 +1,8 @@
+from __future__ import absolute_import
+
+import billiard
+
+
+def test_has_version():
+    assert billiard.__version__
+    assert isinstance(billiard.__version__, str)

setup.py

@@ -0,0 +1,70 @@
+from __future__ import absolute_import
+
+import pytest
+
+from case import skip
+
+from billiard.compat import _winapi
+
+
+@skip.unless_win32()
+class test_win32_module:
+
+    @pytest.mark.parametrize('name', [
+        'NULL',
+        'ERROR_ALREADY_EXISTS',
+        'ERROR_PIPE_BUSY',
+        'ERROR_PIPE_CONNECTED',
+        'ERROR_SEM_TIMEOUT',
+        'ERROR_MORE_DATA',
+        'ERROR_BROKEN_PIPE',
+        'ERROR_IO_PENDING',
+        'ERROR_NETNAME_DELETED',
+        'GENERIC_READ',
+        'GENERIC_WRITE',
+        'DUPLICATE_SAME_ACCESS',
+        'DUPLICATE_CLOSE_SOURCE',
+        'INFINITE',
+        'NMPWAIT_WAIT_FOREVER',
+        'OPEN_EXISTING',
+        'PIPE_ACCESS_DUPLEX',
+        'PIPE_ACCESS_INBOUND',
+        'PIPE_READMODE_MESSAGE',
+        'PIPE_TYPE_MESSAGE',
+        'PIPE_UNLIMITED_INSTANCES',
+        'PIPE_WAIT',
+        'PROCESS_ALL_ACCESS',
+        'PROCESS_DUP_HANDLE',
+        'WAIT_OBJECT_0',
+        'WAIT_ABANDONED_0',
+        'WAIT_TIMEOUT',
+        'FILE_FLAG_FIRST_PIPE_INSTANCE',
+        'FILE_FLAG_OVERLAPPED',
+    ])
+    def test_constants(self, name):
+        assert getattr(_winapi, name) is not None
+
+    @pytest.mark.parametrize('name', [
+        'Overlapped',
+        'CloseHandle',
+        'GetLastError',
+        'OpenProcess',
+        'ExitProcess',
+        'ConnectNamedPipe',
+        'CreateFile',
+        'WriteFile',
+        'ReadFile',
+        'CreateNamedPipe',
+        'SetNamedPipeHandleState',
+        'WaitNamedPipe',
+        'PeekNamedPipe',
+        'WaitForMultipleObjects',
+        'WaitForSingleObject',
+        'GetCurrentProcess',
+        'GetExitCodeProcess',
+        'TerminateProcess',
+        'DuplicateHandle',
+        'CreatePipe',
+    ])
+    def test_functions(self, name):
+        assert getattr(_winapi, name)

t/__init__.py

@@ -4,8 +4,7 @@ envlist = 2.7, 3.4, 3.5, pypy, pypy3
 [testenv]
 distribute = True
 sitepackages = False
-commands = nosetests --with-xunit                               \
-                     --xunit-file={toxinidir}/nosetests.xml
+commands = py.test -xv --cov=celery --cov-report=html
 deps=
     -r{toxinidir}/requirements/test-ci.txt
     -r{toxinidir}/requirements/test.txt