- Fixed bug where "python setup.py test" wasn't calling into

distutils appropriately, and errors would be emitted at the end
of the test suite.

3 files changed, 19 insertions, 1 deletions

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 27baca127..eaa16cf3e 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -15,6 +15,14 @@
     :released:
 
     .. change::
+        :tags: bug, tests
+        :versions: 1.0.0
+
+        Fixed bug where "python setup.py test" wasn't calling into
+        distutils appropriately, and errors would be emitted at the end
+        of the test suite.
+
+    .. change::
         :tags: feature, postgresql
         :versions: 1.0.0
         :pullreq: bitbucket:22
diff --git a/lib/sqlalchemy/testing/distutils_run.py b/lib/sqlalchemy/testing/distutils_run.py
new file mode 100644
index 000000000..d8f8f5931
--- /dev/null
+++ b/lib/sqlalchemy/testing/distutils_run.py
@@ -0,0 +1,10 @@
+"""Quick and easy way to get setup.py test to run py.test without any
+custom setuptools/distutils code.
+
+"""
+import unittest
+import pytest
+
+class TestSuite(unittest.TestCase):
+    def test_sqlalchemy(self):
+        pytest.main()
diff --git a/setup.py b/setup.py
index ae4f8416c..81e388874 100644
--- a/setup.py
+++ b/setup.py
@@ -129,7 +129,7 @@ def run_setup(with_cext):
         license="MIT License",
         cmdclass=cmdclass,
         tests_require=['pytest >= 2.5.2', 'mock'],
-        test_suite="pytest.main",
+        test_suite="sqlalchemy.testing.distutils_run",
         long_description=readme,
         classifiers=[
             "Development Status :: 5 - Production/Stable",