summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2017-06-30 14:53:32 -0700
committerMatt Clay <matt@mystile.com>2017-06-30 16:41:30 -0700
commit7ab4a889ad6c1f6bce301328182701cc2a02fb60 (patch)
treea4561030d6552db781b49ff4cf8e644256bd967e /tox.ini
parent46514de5e665f391c2763f887eebb740321ead97 (diff)
downloadansible-7ab4a889ad6c1f6bce301328182701cc2a02fb60.tar.gz
Update tox.ini to use ansible-test.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini24
1 files changed, 11 insertions, 13 deletions
diff --git a/tox.ini b/tox.ini
index e5754b3041..2e936c4965 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,26 +1,24 @@
[tox]
envlist = py26,py27,py35,py36
-[testenv:py35]
-deps = -r{toxinidir}/test/utils/tox/requirements-py3.txt
-
-[testenv:py36]
-deps = -r{toxinidir}/test/utils/tox/requirements-py3.txt
-
[testenv]
-deps = -r{toxinidir}/test/utils/tox/requirements.txt
-whitelist_externals = make
+deps = -c{toxinidir}/test/runner/requirements/constraints.txt
+ -r{toxinidir}/test/runner/requirements/ansible-test.txt
+ -r{toxinidir}/test/runner/requirements/sanity.txt
+ -r{toxinidir}/test/runner/requirements/units.txt
commands =
python --version
- py26: python -m compileall -fq -x 'test/samples|contrib/inventory/vagrant.py' lib test contrib
- py27: python -m compileall -fq -x 'test/samples' lib test contrib
- py3{5,6}: python -m compileall -fq -x 'test/samples|lib/ansible/modules' lib test contrib
- make tests
+ # The recommended method of running tests with tox is to execute
+ # ansible-test directly and use the --tox and --python options.
+ # The commands below are provided as a convenience for those who
+ # prefer to run tox directly instead of through ansible-test.
+ {toxinidir}/test/runner/ansible-test compile --python default -v
+ {toxinidir}/test/runner/ansible-test sanity --python default -v
+ {toxinidir}/test/runner/ansible-test units --python default -v
passenv =
# Pass HOME to the test environment to avoid the missing HOME env
# variable error. See issue: #20424
HOME
- TEST_FLAGS
[flake8]