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

Merge pull request #3325 from AlanCoding/temporary_pytest_bump

Browse Source 
Temporary pytest bump for tower unit tests
This commit is contained in:
Alan Rominger
2016-08-26 12:58:48 -04:00
committed by GitHub
parent baa2481944 50ec9ca259
commit c87637ea7d
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

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

2
requirements/requirements_dev.txt
View File

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

2
requirements/requirements_jenkins.txt
View File

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