diff options
| author | James Laska <jlaska@ansible.com> | 2015-03-10 19:38:37 -0400 |
|---|---|---|
| committer | James Laska <jlaska@ansible.com> | 2015-03-13 08:20:24 -0400 |
| commit | 3d67e9e0c0df18e5c82e62fdb79820724dbe2577 (patch) | |
| tree | e0943c71ace01e7e05fb64e54c9edfe2d49cf7c9 | |
| parent | c8de03d516adeae9b899212569528be559c6209f (diff) | |
| download | ansible-3d67e9e0c0df18e5c82e62fdb79820724dbe2577.tar.gz | |
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
| -rw-r--r-- | .coveragerc | 4 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | test-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 7 |
7 files changed, 29 insertions, 2 deletions
diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000000..812fc3b139 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,4 @@ +[report] +omit = + */python?.?/* + */site-packages/nose/* diff --git a/.gitignore b/.gitignore index 5fe1d994e3..5d3970a168 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ deb-build credentials.yml # test output .coverage +.tox results.xml coverage.xml /test/units/cover-html diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..6e18e06050 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +sudo: false +language: python +env: + - TOXENV=py26 + - TOXENV=py27 +install: + - pip install tox +script: + - tox +after_success: + - coveralls @@ -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 @@ -1,4 +1,6 @@ -[](http://badge.fury.io/py/ansible) [](https://pypi.python.org/pypi/ansible) +[](http://badge.fury.io/py/ansible) +[](https://pypi.python.org/pypi/ansible) +[](https://travis-ci.org/ansible/ansible) Ansible diff --git a/test-requirements.txt b/test-requirements.txt index 714b65b764..abb61ed1e9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,3 +5,5 @@ nose mock passlib +coverage +coveralls diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000000..7c86e7e08f --- /dev/null +++ b/tox.ini @@ -0,0 +1,7 @@ +[tox] +envlist = py26,py27 + +[testenv] +deps = -r{toxinidir}/test-requirements.txt +whitelist_externals = make +commands = make tests |