External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 11:50:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

temporarily pin the pytest version until the ldap error can be fixed

Browse Source
This commit is contained in:
AlanCoding 2016-08-23 15:35:43 -04:00
parent 965827ca4e
commit 50ec9ca259
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -448,13 +448,22 @@ check: flake8 pep8 # pyflakes pylint
TEST_DIRS=awx/main/tests
# Run all API unit tests.
test:
@if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \
fi; \
py.test $(TEST_DIRS)
test_unit:
@if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \
fi; \
py.test awx/main/tests/unit
# Run all API unit tests with coverage enabled.
test_coverage:
@if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \
fi; \
py.test --create-db --cov=awx --cov-report=xml --junitxml=./reports/junit.xml $(TEST_DIRS)
# Output test coverage as HTML (into htmlcov directory).

2
requirements/requirements_dev.txt
View File

@ -5,7 +5,7 @@ unittest2
pep8
flake8
pyflakes==1.0.0 # Pinned until PR merges https://gitlab.com/pycqa/flake8/merge_requests/56
pytest
pytest==2.9.2
pytest-cov
pytest-django
pytest-pythonpath

2
requirements/requirements_jenkins.txt
View File

@ -6,7 +6,7 @@ pylint
flake8
distribute==0.7.3
unittest2
pytest
pytest==2.9.2
pytest-cov
pytest-django
pytest-pythonpath