From 5424155cd06329d7d0adb4bec7bad5b87f0c64b8 Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <github@portabase.org>
Date: Fri, 19 Apr 2019 10:44:41 -0400
Subject: [PATCH] TE-2861 Use correct version of Django in tests (#20271)

---
 scripts/xdist/prepare_xdist_nodes.sh | 10 +++++++++-
 tox.ini                              |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/xdist/prepare_xdist_nodes.sh b/scripts/xdist/prepare_xdist_nodes.sh
index af221f8f968a..1e5096fb8519 100644
--- a/scripts/xdist/prepare_xdist_nodes.sh
+++ b/scripts/xdist/prepare_xdist_nodes.sh
@@ -14,13 +14,21 @@ else
     XDIST_GIT_FETCH_STRING="$XDIST_GIT_BRANCH:$XDIST_GIT_BRANCH"
 fi
 
+# Install the correct version of Django depending on which tox environment (if any) is in use
+if [[ -z ${TOX_ENV+x} ]] || [[ ${TOX_ENV} == 'null' ]]; then
+    DJANGO_REQUIREMENT="-r requirements/edx/django.txt"
+else
+    DJANGO_REQUIREMENT=$(pip freeze | grep "^[Dd]jango==")
+fi
+
 ip_list=$(<pytest_task_ips.txt)
 for ip in $(echo $ip_list | sed "s/,/ /g")
 do
     container_reqs_cmd="ssh -o StrictHostKeyChecking=no ubuntu@$ip 'cd /edx/app/edxapp;
     git clone --branch master --depth 1 --no-tags -q https://github.com/edx/edx-platform.git; cd edx-platform;
     git fetch --depth=1 --no-tags -q origin ${XDIST_GIT_FETCH_STRING}; git checkout -q ${XDIST_GIT_BRANCH};
-    source /edx/app/edxapp/edxapp_env; pip install -qr requirements/edx/testing.txt; mkdir reports' & "
+    source /edx/app/edxapp/edxapp_env;
+    pip install -q ${DJANGO_REQUIREMENT} -r requirements/edx/testing.txt; mkdir reports' & "
 
     cmd=$cmd$container_reqs_cmd
 done
diff --git a/tox.ini b/tox.ini
index d917b5d29cfe..a947ef1ce2da 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,7 +54,7 @@ passenv =
     XDIST_NUM_TASKS
     XDIST_REMOTE_NUM_PROCESSES
 deps =
-    django111: Django>=1.11,<2
+    django111: -r requirements/edx/django.txt
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
     -r requirements/edx/testing.txt