From 968081fad760b174fa58a449ee52f314260bb042 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Thu, 23 May 2019 18:23:42 -0700
Subject: [PATCH] Fix certonly_standalone tests with python3 only

---
 .../scripts/test_letsencrypt_auto_certonly_standalone.sh     | 5 ++++-
 tests/letstest/scripts/test_sdists.sh                        | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh b/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh
index 0973bbc03..744adf466 100755
--- a/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh
+++ b/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh
@@ -18,6 +18,8 @@ export PATH="$LE_AUTO_DIR:$PATH"
 
 letsencrypt-auto --os-packages-only --debug --version
 
+. tests/letstest/scripts/set_python_envvars.sh
+
 # Create a venv-like layout at the old virtual environment path to test that a
 # symlink is properly created when letsencrypt-auto runs.
 HOME=${HOME:-~root}
@@ -32,7 +34,8 @@ letsencrypt-auto certonly --no-self-upgrade -v --standalone --debug \
                    --register-unsafely-without-email \
                    --domain $PUBLIC_HOSTNAME --server $BOULDER_URL
 
-if [ "$(tools/readlink.py ${XDG_DATA_HOME:-~/.local/share}/letsencrypt)" != "/opt/eff.org/certbot/venv" ]; then
+LINK_PATH=$("$PYTHON_NAME" tools/readlink.py ${XDG_DATA_HOME:-~/.local/share}/letsencrypt)
+if [ "$LINK_PATH" != "/opt/eff.org/certbot/venv" ]; then
     echo symlink from old venv path not properly created!
     exit 1
 fi
diff --git a/tests/letstest/scripts/test_sdists.sh b/tests/letstest/scripts/test_sdists.sh
index f407d5d2c..e6ae141e1 100755
--- a/tests/letstest/scripts/test_sdists.sh
+++ b/tests/letstest/scripts/test_sdists.sh
@@ -6,7 +6,6 @@ cd letsencrypt
 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_PATH="venv3"