summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJames Laska <jlaska@ansible.com>2015-03-11 00:38:37 +0100
committerJames Laska <jlaska@ansible.com>2015-03-13 13:20:24 +0100
commit3d67e9e0c0df18e5c82e62fdb79820724dbe2577 (patch)
treee0943c71ace01e7e05fb64e54c9edfe2d49cf7c9 /Makefile
parentMerge pull request #10448 from jhermann/add-test-requirements (diff)
downloadansible-3d67e9e0c0df18e5c82e62fdb79820724dbe2577.tar.xz
ansible-3d67e9e0c0df18e5c82e62fdb79820724dbe2577.zip
Add tox and travis-ci support
Add tox integration to run unittests in supported python releases. Travis-CI is used for test execution. Additionally, the unittest TestQuotePgIdentifier was updated to support using assert_raises_regexp on python-2.6. Sample travis-ci output available at https://travis-ci.org/ansible/ansible/builds/54189977
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f688bd73bf..81e24efab3 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ NOSETESTS3 ?= nosetests-3.3
all: clean python
tests:
- PYTHONPATH=./lib $(NOSETESTS) -d -w test/units -v # Could do: --with-coverage --cover-package=ansible
+ PYTHONPATH=./lib $(NOSETESTS) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches
newtests:
PYTHONPATH=./v2:./lib $(NOSETESTS) -d -w v2/test -v --with-coverage --cover-package=ansible --cover-branches