From 50ec9ca2599b2a0a1bdf9780e9c35a8f0789994d Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Tue, 23 Aug 2016 15:35:43 -0400
Subject: [PATCH] temporarily pin the pytest version until the ldap error can
 be fixed

---
 Makefile                              | 9 +++++++++
 requirements/requirements_dev.txt     | 2 +-
 requirements/requirements_jenkins.txt | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b7e3fd9d21..6d3ada31fb 100644
--- a/Makefile
+++ b/Makefile
@@ -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).
diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt
index d986b1dc89..3e7cf4ae8c 100644
--- a/requirements/requirements_dev.txt
+++ b/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
diff --git a/requirements/requirements_jenkins.txt b/requirements/requirements_jenkins.txt
index ff3fda270f..287a714939 100644
--- a/requirements/requirements_jenkins.txt
+++ b/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