From 1d0997286e1a039e431f4fb45d3ff68abb97b49e Mon Sep 17 00:00:00 2001
From: Pradyun Gedam <pradyunsg@gmail.com>
Date: Wed, 8 Apr 2020 18:47:06 +0530
Subject: [PATCH] Drop --use-venv from all CI tests

This is being done since our test setup is basically borked with venv.
---
 .azure-pipelines/jobs/test-windows.yml       |  3 ---
 .azure-pipelines/steps/run-tests-windows.yml |  6 +-----
 tools/travis/run.sh                          | 10 +++++-----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.azure-pipelines/jobs/test-windows.yml b/.azure-pipelines/jobs/test-windows.yml
index 1a933a6934b..728a4ea69e2 100644
--- a/.azure-pipelines/jobs/test-windows.yml
+++ b/.azure-pipelines/jobs/test-windows.yml
@@ -15,14 +15,12 @@ jobs:
       Python27-x64:
         python.version: '2.7'
         python.architecture: x64
-        useVenv: true
       Python35-x64:
         python.version: '3.5'
         python.architecture: x64
       Python36-x64:
         python.version: '3.6'
         python.architecture: x64
-        useVenv: true
       Python37-x64:
         python.version: '3.7'
         python.architecture: x64
@@ -35,7 +33,6 @@ jobs:
   - template: ../steps/run-tests-windows.yml
     parameters:
       runIntegrationTests: true
-      useVenv: '$(useVenv)'
 
 - job: Test_Secondary
   displayName: Test Secondary
diff --git a/.azure-pipelines/steps/run-tests-windows.yml b/.azure-pipelines/steps/run-tests-windows.yml
index 3832e46621b..a65136289ab 100644
--- a/.azure-pipelines/steps/run-tests-windows.yml
+++ b/.azure-pipelines/steps/run-tests-windows.yml
@@ -1,6 +1,5 @@
 parameters:
   runIntegrationTests:
-  useVenv: false
 
 steps:
 - task: UsePythonVersion@0
@@ -44,11 +43,8 @@ steps:
       # https://bugs.python.org/issue18199
       $env:TEMP = "R:\Temp"
 
-      tox -e py -- $env:USE_VENV_ARG -m integration -n auto --duration=5 --junit-xml=junit/integration-test.xml
+      tox -e py -- -m integration -n auto --duration=5 --junit-xml=junit/integration-test.xml
     displayName: Tox run integration tests
-    env:
-      ${{ if eq(parameters.useVenv, 'true') }}:
-        USE_VENV_ARG: "--use-venv"
 
 - task: PublishTestResults@2
   displayName: Publish Test Results
diff --git a/tools/travis/run.sh b/tools/travis/run.sh
index 86f975f4f16..b6a2158a006 100755
--- a/tools/travis/run.sh
+++ b/tools/travis/run.sh
@@ -24,8 +24,8 @@ if [[ $TOXENV != docs ]] || [[ $TOXENV != lint ]]; then
 fi
 
 # Export the correct TOXENV when not provided.
-echo "Determining correct TOXENV..."
 if [[ -z "$TOXENV" ]]; then
+    echo "Determining correct TOXENV..."
     if [[ ${TRAVIS_PYTHON_VERSION} == pypy* ]]; then
         export TOXENV=pypy
     else
@@ -34,19 +34,19 @@ if [[ -z "$TOXENV" ]]; then
         _minor=${TRAVIS_PYTHON_VERSION:2:1}
         export TOXENV="py${_major}${_minor}"
     fi
+    echo "TOXENV=${TOXENV}"
 fi
-echo "TOXENV=${TOXENV}"
 
 # Print the commands run for this test.
 set -x
 if [[ "$GROUP" == "1" ]]; then
     # Unit tests
-    tox -- --use-venv -m unit -n auto
+    tox -- -m unit -n auto
     # Integration tests (not the ones for 'pip install')
-    tox -- --use-venv -m integration -n auto --duration=5 -k "not test_install"
+    tox -- -m integration -n auto --duration=5 -k "not test_install"
 elif [[ "$GROUP" == "2" ]]; then
     # Separate Job for running integration tests for 'pip install'
-    tox -- --use-venv -m integration -n auto --duration=5 -k "test_install"
+    tox -- -m integration -n auto --duration=5 -k "test_install"
 else
     # Non-Testing Jobs should run once
     tox