From 10fa95cba8956092b12bfb4283e026c1059f6776 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 15 May 2019 15:09:33 -0700
Subject: [PATCH 1/2] Use Python 3 when appropriate.

---
 tests/letstest/scripts/test_sdists.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/letstest/scripts/test_sdists.sh b/tests/letstest/scripts/test_sdists.sh
index a9177f690..6ba6bca45 100755
--- a/tests/letstest/scripts/test_sdists.sh
+++ b/tests/letstest/scripts/test_sdists.sh
@@ -1,14 +1,21 @@
 #!/bin/sh -xe
 
 cd letsencrypt
-./certbot-auto --os-packages-only -n --debug
+./certbot-auto --install-only -n --debug
 
 PLUGINS="certbot-apache certbot-nginx"
+PYTHON_MAJOR_VERSION=$(/opt/eff.org/certbot/venv/bin/python --version 2>&1 | cut -d" " -f 2 | cut -d. -f1)
 TEMP_DIR=$(mktemp -d)
 VERSION=$(letsencrypt-auto-source/version.py)
 
+if [ "$PYTHON_MAJOR_VERSION" = "3" ]; then
+    VENV_SCRIPT="tools/venv3.py"
+else
+    VENV_SCRIPT="tools/venv.py"
+fi
+
 # setup venv
-tools/venv.py --requirement letsencrypt-auto-source/pieces/dependency-requirements.txt
+"$VENV_SCRIPT" --requirement letsencrypt-auto-source/pieces/dependency-requirements.txt
 . ./venv/bin/activate
 # pytest is needed to run tests on some of our packages so we install a pinned version here.
 tools/pip_install.py pytest

From 846de3cc65958e099f31603581d4fddf0f36604f Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 15 May 2019 15:16:15 -0700
Subject: [PATCH 2/2] fix venv path

---
 tests/letstest/scripts/test_sdists.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/letstest/scripts/test_sdists.sh b/tests/letstest/scripts/test_sdists.sh
index 6ba6bca45..f407d5d2c 100755
--- a/tests/letstest/scripts/test_sdists.sh
+++ b/tests/letstest/scripts/test_sdists.sh
@@ -9,14 +9,16 @@ TEMP_DIR=$(mktemp -d)
 VERSION=$(letsencrypt-auto-source/version.py)
 
 if [ "$PYTHON_MAJOR_VERSION" = "3" ]; then
+    VENV_PATH="venv3"
     VENV_SCRIPT="tools/venv3.py"
 else
     VENV_SCRIPT="tools/venv.py"
+    VENV_PATH="venv"
 fi
 
 # setup venv
 "$VENV_SCRIPT" --requirement letsencrypt-auto-source/pieces/dependency-requirements.txt
-. ./venv/bin/activate
+. "$VENV_PATH/bin/activate"
 # pytest is needed to run tests on some of our packages so we install a pinned version here.
 tools/pip_install.py pytest