diff options
| -rw-r--r-- | README.unittests | 29 | ||||
| -rw-r--r-- | setup.py | 6 | ||||
| -rwxr-xr-x | sqla_nose.py | 3 |
3 files changed, 17 insertions, 21 deletions
diff --git a/README.unittests b/README.unittests index 6c4353b35..b9e37db7c 100644 --- a/README.unittests +++ b/README.unittests @@ -5,32 +5,33 @@ SQLALCHEMY UNIT TESTS SQLAlchemy unit tests by default run using Python's built-in sqlite3 module. If running on Python 2.4, pysqlite must be installed. -Unit tests are run using nose. Note that in most cases, -nose needs to be installed manually. Documentation and -downloads for nose are available at: +Unit tests are run using nose. Nose is available at: -http://somethingaboutorange.com/mrl/projects/nose/0.11.1/index.html - -Or using setuptools: - - $ easy_install nose + http://pypi.python.org/pypi/nose/ SQLAlchemy implements a nose plugin that must be present when tests are run. This plugin is invoked when the test runner script provided with SQLAlchemy is used. **NOTE:** - the nose plugin is no longer installed by setuptools as of -version 0.7 ! Please use sqla_nose.py to run tests. +version 0.7 ! Use "python setup.py test" or "./sqla_nose.py". + +RUNNING TESTS VIA SETUP.PY +-------------------------- +A plain vanilla run of all tests using sqlite can be run via setup.py: + + $ python setup.py test -RUNNING ALL TESTS ------------------ +The -v flag also works here: + + $ python setup.py test -v + +RUNNING ALL TESTS +------------------ To run all tests: $ ./sqla_nose.py -(NOTE: if running with Python 2.7 and nose 0.11.3, add "-w test/" to the command. -Again this is a Nose issue, see Nose issue 342.) - If you're running the tests on Microsoft Windows, then there is an additional argument that must be passed to ./sqla_nose.py: @@ -82,12 +82,8 @@ setup(name = "SQLAlchemy", package_dir = {'':'lib'}, license = "MIT License", - # TODO: this is nice, but Python 3 support ? - # any way to make it not install for build/install ? - #setup_requires=["setuptools_hg"], - tests_require = ['nose >= 0.11'], - test_suite = "nose.collector", + test_suite = "sqla_nose", long_description = """\ SQLAlchemy is: diff --git a/sqla_nose.py b/sqla_nose.py index e6f60e476..09481410c 100755 --- a/sqla_nose.py +++ b/sqla_nose.py @@ -16,5 +16,4 @@ from test.bootstrap.noseplugin import NoseSQLAlchemy import nose -if __name__ == '__main__': - nose.main(addplugins=[NoseSQLAlchemy()]) +nose.main(addplugins=[NoseSQLAlchemy()]) |