From f90c76846b694cb028520aab0d3bedc47e753330 Mon Sep 17 00:00:00 2001
From: Chris Ladd <chris.ladd@teradata.com>
Date: Mon, 2 Dec 2019 12:28:11 -0800
Subject: [PATCH] INTERNAL: Update `test-framework` to use `python3` and
 refresh its module versions

---
 test-framework/Makefile                        |  7 +------
 test-framework/requirements.txt                | 18 +++++-------------
 .../test-suites/integration/run-tests.sh       |  2 +-
 test-framework/test-suites/unit/run-tests.sh   |  2 +-
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/test-framework/Makefile b/test-framework/Makefile
index b7f4298fb..d5a18ebd0 100644
--- a/test-framework/Makefile
+++ b/test-framework/Makefile
@@ -3,13 +3,8 @@ SHELL = /bin/bash
 .DEFAULT_GOAL = environment
 .PHONY = environment clean
 
-bin/pip: VERSION = 15.1.0
-
 bin/pip:
-	curl --retry 10 -fsO `curl --retry 10 -fs https://pypi.org/pypi/virtualenv/$(VERSION)/json | grep -o -E '"url":"https://files.pythonhosted.org/packages/[0-9a-f]+/[0-9a-f]+/[0-9a-f]+/virtualenv-$(VERSION).tar.gz"' | head -n 1 | cut -d '"' -f 4`
-	tar xvzf virtualenv-$(VERSION).tar.gz
-	python2.7 virtualenv-$(VERSION)/virtualenv.py venv
-	rm -rf virtualenv-$(VERSION)/ virtualenv-$(VERSION).tar.gz
+	python3 -m venv venv
 	ln -s venv/bin bin
 
 environment: bin/pip
diff --git a/test-framework/requirements.txt b/test-framework/requirements.txt
index 5c2f3900d..0c3e9f366 100644
--- a/test-framework/requirements.txt
+++ b/test-framework/requirements.txt
@@ -1,16 +1,8 @@
-ansible==2.8.4
-asn1crypto==0.24.0
-bcrypt==3.1.7
-cffi==1.12.3
-cryptography==2.7
-enum34==1.1.6
-idna==2.8
-ipaddress==1.0.22
-Jinja2==2.10.1
+ansible==2.9.1
+cffi==1.13.2
+cryptography==2.8
+Jinja2==2.10.3
 MarkupSafe==1.1.1
-paramiko==2.6.0
-pyasn1==0.4.7
 pycparser==2.19
-PyNaCl==1.3.0
 PyYAML==5.1.2
-six==1.12.0
+six==1.13.0
diff --git a/test-framework/test-suites/integration/run-tests.sh b/test-framework/test-suites/integration/run-tests.sh
index cabff1ebb..6dbc81bc1 100755
--- a/test-framework/test-suites/integration/run-tests.sh
+++ b/test-framework/test-suites/integration/run-tests.sh
@@ -36,7 +36,7 @@ done
 if [[ $COVERAGE -eq 1 ]]
 then
     # Figure out which .coveragerc to pass
-    STACKI_ISO=$(cat .cache/state.json | python -c 'import sys, json; print json.load(sys.stdin)["STACKI_ISO"]')
+    STACKI_ISO=$(cat .cache/state.json | python3 -c 'import sys, json; print(json.load(sys.stdin)["STACKI_ISO"])')
     if [[ $(basename $STACKI_ISO) =~ sles12\.x86_64\.disk1\.iso ]]
     then
         COVERAGERC="sles.coveragerc"
diff --git a/test-framework/test-suites/unit/run-tests.sh b/test-framework/test-suites/unit/run-tests.sh
index bd7bb3158..a7787630f 100755
--- a/test-framework/test-suites/unit/run-tests.sh
+++ b/test-framework/test-suites/unit/run-tests.sh
@@ -13,7 +13,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 if [[ $1 == "--coverage" ]]
 then
     # Figure out which .coveragerc to pass
-    STACKI_ISO=$(cat .cache/state.json | python -c 'import sys, json; print json.load(sys.stdin)["STACKI_ISO"]')
+    STACKI_ISO=$(cat .cache/state.json | python3 -c 'import sys, json; print(json.load(sys.stdin)["STACKI_ISO"])')
     if [[ $(basename $STACKI_ISO) =~ sles12\.x86_64\.disk1\.iso ]]
     then
         COVERAGERC="sles.coveragerc"