Merge pull request #3325 from AlanCoding/temporary_pytest_bump

Temporary pytest bump for tower unit tests

Makefile

@@ -451,13 +451,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).

requirements/requirements_dev.txt

@@ -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

requirements/requirements_jenkins.txt

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