Permalink
Browse files

'python setup.py test' is now how to run the tests, not 'setup.py nos…

…etests'
  • Loading branch information...
1 parent ec090a6 commit c6cf30f4dcb645ad5f1097fac22046f395c4155e @ajdavis ajdavis committed Jan 23, 2013
Showing with 5 additions and 4 deletions.
  1. +1 −1 CONTRIBUTING.rst
  2. +1 −1 README.rst
  3. +3 −2 setup.py
View
@@ -17,6 +17,6 @@ General Guidelines
- Avoid backward breaking changes if at all possible.
- Write inline documentation for new classes and methods.
- Write tests and make sure they pass (make sure you have a mongod
- running on the default port, then execute ``python setup.py nosetests``
+ running on the default port, then execute ``python setup.py test``
from the command line to run the test suite).
- Add yourself to doc/contributors.rst :)
View
@@ -58,7 +58,7 @@ Testing
=======
The easiest way to run the tests is to install nose_ and run ``nosetests``
-or ``python setup.py nosetests`` in the root of the distribution. Tests are
+or ``python setup.py test`` in the root of the distribution. Tests are
located in the ``test/`` directory.
.. _PyMongo: http://pypi.python.org/pypi/pymongo/
View
@@ -30,7 +30,7 @@
kwargs['use_2to3'] = True
packages = ['motor']
-if "nosetests" in sys.argv:
+if 'test' in sys.argv or 'nosetests' in sys.argv:
packages.append('test')
setup(name='motor',
@@ -50,7 +50,8 @@
keywords=[
"mongo", "mongodb", "pymongo", "gridfs", "bson", "motor", "tornado",
],
- # use python setup.py nosetests to test
+ # use 'python setup.py test' to test
setup_requires=['nose'],
+ test_suite='nose.main',
**kwargs
)

0 comments on commit c6cf30f

Please sign in to comment.