1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Update tox.ini to use ansible-test.

This commit is contained in:
Matt Clay 2017-06-30 14:53:32 -07:00
parent 46514de5e6
commit 7ab4a889ad
4 changed files with 14 additions and 50 deletions

View file

@ -182,7 +182,7 @@ def parse_args():
integration.add_argument('--python', integration.add_argument('--python',
metavar='VERSION', metavar='VERSION',
choices=SUPPORTED_PYTHON_VERSIONS, choices=SUPPORTED_PYTHON_VERSIONS + ('default',),
help='python version: %s' % ', '.join(SUPPORTED_PYTHON_VERSIONS)) help='python version: %s' % ', '.join(SUPPORTED_PYTHON_VERSIONS))
integration.add_argument('--start-at', integration.add_argument('--start-at',
@ -281,7 +281,7 @@ def parse_args():
compiler.add_argument('--python', compiler.add_argument('--python',
metavar='VERSION', metavar='VERSION',
choices=COMPILE_PYTHON_VERSIONS, choices=COMPILE_PYTHON_VERSIONS + ('default',),
help='python version: %s' % ', '.join(COMPILE_PYTHON_VERSIONS)) help='python version: %s' % ', '.join(COMPILE_PYTHON_VERSIONS))
add_lint(compiler) add_lint(compiler)
@ -313,7 +313,7 @@ def parse_args():
sanity.add_argument('--python', sanity.add_argument('--python',
metavar='VERSION', metavar='VERSION',
choices=SUPPORTED_PYTHON_VERSIONS, choices=SUPPORTED_PYTHON_VERSIONS + ('default',),
help='python version: %s' % ', '.join(SUPPORTED_PYTHON_VERSIONS)) help='python version: %s' % ', '.join(SUPPORTED_PYTHON_VERSIONS))
sanity.add_argument('--base-branch', sanity.add_argument('--base-branch',

View file

@ -1,16 +0,0 @@
#
# Test requirements
#
nose
mock >= 1.0.1, < 1.1
passlib
coverage
coveralls
unittest2
redis
python3-memcached
python-systemd
botocore
boto3
pytest

View file

@ -1,18 +0,0 @@
#
# Test requirements
#
nose
mock >= 1.0.1, < 1.1
passlib
coverage
coveralls
unittest2
redis
python-memcached
python-systemd
cryptography
pycrypto
botocore
boto3
pytest

24
tox.ini
View file

@ -1,26 +1,24 @@
[tox] [tox]
envlist = py26,py27,py35,py36 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] [testenv]
deps = -r{toxinidir}/test/utils/tox/requirements.txt deps = -c{toxinidir}/test/runner/requirements/constraints.txt
whitelist_externals = make -r{toxinidir}/test/runner/requirements/ansible-test.txt
-r{toxinidir}/test/runner/requirements/sanity.txt
-r{toxinidir}/test/runner/requirements/units.txt
commands = commands =
python --version python --version
py26: python -m compileall -fq -x 'test/samples|contrib/inventory/vagrant.py' lib test contrib # The recommended method of running tests with tox is to execute
py27: python -m compileall -fq -x 'test/samples' lib test contrib # ansible-test directly and use the --tox and --python options.
py3{5,6}: python -m compileall -fq -x 'test/samples|lib/ansible/modules' lib test contrib # The commands below are provided as a convenience for those who
make tests # 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 = passenv =
# Pass HOME to the test environment to avoid the missing HOME env # Pass HOME to the test environment to avoid the missing HOME env
# variable error. See issue: #20424 # variable error. See issue: #20424
HOME HOME
TEST_FLAGS
[flake8] [flake8]