Permalink
Browse files

Unify all tests running under nosetests

This means:

* command line tests during development
* the Travis CI configuration for github-integrated testing
* tox for local dist builds
  • Loading branch information...
1 parent fbe0042 commit 7cd3fb3c4edb329684adb0c54d897d9e2f1e1c83 @pteichman committed Sep 9, 2012
Showing with 12 additions and 5 deletions.
  1. +1 −1 .travis.yml
  2. +10 −0 setup.py
  3. +1 −4 tox.ini
View
@@ -6,4 +6,4 @@ python:
install: pip install --use-mirrors flake8
script:
- flake8 cobe tests
- - python setup.py test
+ - python setup.py nosetests
View
@@ -16,9 +16,19 @@
url = "http://wiki.github.com/pteichman/cobe/",
description = "Markov chain based text generator library and chatbot",
packages = ["cobe"],
+
+ # setup_require nosetests, so that the nosetests command is
+ # available immediately in a fresh checkout
+ setup_requires = [
+ "nose==1.1.2"
+ ],
+
test_suite = "unittest2.collector",
+ # mock and unittest2 are required by the tests; coverage is
+ # required by the [nosetests] section of setup.cfg.
tests_require = [
+ "coverage==3.5.2",
"mock==1.0b1",
"unittest2==0.5.1"
],
View
@@ -3,11 +3,8 @@ envlist = py26, py27
[testenv]
deps=
- coverage==3.5.2
flake8==1.4
commands=
flake8 cobe tests
- coverage erase
- coverage run setup.py test
- coverage report -m --include="*cobe*"
+ python setup.py nosetests

0 comments on commit 7cd3fb3

Please sign in to comment.