Fix running of setup.py test with recent setuptools.

Referencing "setup" in the "test_suite" setup() argument leads to
setup.py being executed twice, which leads to a broken command
behaviour.

Author: elprans

Makefile

@@ -28,21 +28,13 @@ debug:
 
 
 test:
-	PYTHONASYNCIODEBUG=1 $(PYTHON) -m unittest discover -s tests
-	$(PYTHON) -m unittest discover -s tests
-	USE_UVLOOP=1 $(PYTHON) -m unittest discover -s tests
+	PYTHONASYNCIODEBUG=1 $(PYTHON) setup.py test
+	$(PYTHON) setup.py test
+	USE_UVLOOP=1 $(PYTHON) setup.py test
 
 
 quicktest:
-	$(PYTHON) -m unittest discover -s tests
-
-
-sdist: clean compile test
-	$(PYTHON) setup.py sdist
-
-
-release: clean compile test
-	$(PYTHON) setup.py sdist upload
+	$(PYTHON) setup.py test
 
 
 htmldocs: compile

setup.py

@@ -10,7 +10,6 @@
 import platform
 import re
 import sys
-import unittest
 
 import setuptools
 from setuptools.command import build_ext as _build_ext
@@ -29,12 +28,6 @@
     CFLAGS.extend(['-Wall', '-Wsign-compare', '-Wconversion'])
 
 
-def discover_tests():
-    test_loader = unittest.TestLoader()
-    test_suite = test_loader.discover('tests', pattern='test_*.py')
-    return test_suite
-
-
 class build_ext(_build_ext.build_ext):
     user_options = _build_ext.build_ext.user_options + [
         ('cython-always', None,
@@ -46,12 +39,24 @@ class build_ext(_build_ext.build_ext):
     ]
 
     def initialize_options(self):
+        # initialize_options() may be called multiple times on the
+        # same command object, so make sure not to override previously
+        # set options.
+        if getattr(self, '_initialized', False):
+            return
+
         super(build_ext, self).initialize_options()
         self.cython_always = False
         self.cython_annotate = None
         self.cython_directives = None
 
     def finalize_options(self):
+        # finalize_options() may be called multiple times on the
+        # same command object, so make sure not to override previously
+        # set options.
+        if getattr(self, '_initialized', False):
+            return
+
         need_cythonize = self.cython_always
         cfiles = {}
 
@@ -209,5 +214,5 @@ def _patch_cfile(self, cfile):
             extra_link_args=LDFLAGS)
     ],
     cmdclass={'build_ext': build_ext},
-    test_suite='setup.discover_tests',
+    test_suite='tests.suite',
 )

tests/__init__.py

@@ -0,0 +1,7 @@
+import unittest
+
+
+def suite():
+    test_loader = unittest.TestLoader()
+    test_suite = test_loader.discover('.', pattern='test_*.py')
+    return test_suite