diff options
| author | Wayne Witzel III <wwitzel@redhat.com> | 2016-01-28 18:01:12 +0100 |
|---|---|---|
| committer | Wayne Witzel III <wwitzel@redhat.com> | 2016-02-02 00:37:56 +0100 |
| commit | 71a1547c3a404fd31704b541274f773c43359357 (patch) | |
| tree | 9fa53652c27739302141066e0fda0ad6420cf229 /Makefile | |
| parent | updating commands tests (diff) | |
| download | awx-71a1547c3a404fd31704b541274f773c43359357.tar.xz awx-71a1547c3a404fd31704b541274f773c43359357.zip | |
fixing ad_hoc imports
flake8 fixes
Fix and add awx/api/tests
added fact tests
added proper xml reports for jenkins
added jenkins requirements and adjusted Makefile target
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -155,7 +155,7 @@ endif .PHONY: clean rebase push requirements requirements_dev requirements_jenkins \ real-requirements real-requirements_dev real-requirements_jenkins \ develop refresh adduser syncdb migrate dbchange dbshell runserver celeryd \ - receiver test test_coverage coverage_html test_jenkins dev_build \ + receiver test test_unit test_coverage coverage_html test_jenkins dev_build \ release_build release_clean sdist rpmtar mock-rpm mock-srpm rpm-sign \ build-ui sync-ui test-ui build-ui-for-coverage test-ui-for-coverage \ build-ui-for-browser-tests test-ui-debug jshint ngdocs \ @@ -360,14 +360,14 @@ check: flake8 pep8 # pyflakes pylint # Run all API unit tests. test: - $(PYTHON) -m py.test awx/main/tests + py.test awx/main/tests awx/api/tests awx/fact/tests test_unit: - $(PYTHON) -m py.test awx/main/tests/unit + py.test awx/main/tests/unit # Run all API unit tests with coverage enabled. test_coverage: - $(PYTHON) -m py.test --cov=awx awx/main/tests + py.test --cov=awx --cov-report=xml --junitxml=./reports/junit.xml awx/main/tests awx/api/tests awx/fact/tests # Output test coverage as HTML (into htmlcov directory). coverage_html: @@ -378,8 +378,8 @@ test_tox: tox -v # Run unit tests to produce output for Jenkins. -test_jenkins: - $(PYTHON) manage.py jenkins -v2 --enable-coverage --project-apps-tests +# Alias existing make target so old versions run against Jekins the same way +test_jenkins : test_coverage # UI TASKS # -------------------------------------- |