summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMatt Martz <matt@sivel.net>2015-05-08 11:34:19 -0500
committerMatt Martz <matt@sivel.net>2015-05-08 13:40:02 -0500
commita0fc8bb0bd834e29a652ed7face4ca360dc6cc56 (patch)
tree779cf120de690e2d464feecb1dd5015cd958dd59 /tox.ini
parent0f1eb3cfc2b6eb6652d13aa4cc1055b7d726f4fb (diff)
downloadansible-a0fc8bb0bd834e29a652ed7face4ca360dc6cc56.tar.gz
Testing additions and fixes
* Fix import pathing for units.mock * Add some additional requirements * Use compileall to test compatiblity with different python versions
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini36
1 files changed, 22 insertions, 14 deletions
diff --git a/tox.ini b/tox.ini
index 5440a5825c..26d80ff7d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,23 +1,31 @@
[tox]
-envlist = {py26,py27}-v{1}
+envlist = {py26,py27}
[testenv]
commands = make tests
deps = -r{toxinidir}/test-requirements.txt
whitelist_externals = make
-[testenv:py26-v1]
-
-[testenv:py27-v1]
-
-[testenv:py26-v2]
-deps = -r{toxinidir}/v2/test-requirements.txt
-commands = make newtests
+[testenv:py26]
+commands =
+ python -m compileall -fq -x 'test|samples' .
+ python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils
+ make tests
+deps = -r{toxinidir}/test-requirements.txt
+whitelist_externals =
+ make
+ python2.4
-[testenv:py27-v2]
-deps = -r{toxinidir}/v2/test-requirements.txt
-commands = make newtests
+[testenv:py27]
+commands =
+ python -m compileall -fq -x 'test|samples' .
+ make tests
+deps = -r{toxinidir}/test-requirements.txt
+whitelist_externals = make
-[testenv:py34-v2]
-deps = -r{toxinidir}/v2/test-requirements.txt
-commands = make newtests
+[testenv:py34]
+commands =
+ python -m compileall -fq -x 'lib/ansible/module_utils' lib
+ make tests
+deps = -r-r{toxinidir}/test-requirements.txt
+whitelist_externals = make