From 91f53dc8dbf971bbc8624a5ae0677d164aeaa0b8 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Tue, 22 Dec 2015 18:57:37 -0800
Subject: [PATCH] Fix various bugs

---
 multitester.py          | 2 +-
 scripts/test_apache2.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/multitester.py b/multitester.py
index fb29ab9eb..a9b766913 100644
--- a/multitester.py
+++ b/multitester.py
@@ -75,7 +75,7 @@ parser.add_argument('--saveinstances',
                     action='store_true',
                     help="don't kill EC2 instances after run, useful for debugging")
 parser.add_argument('--alt_pip',
-                    default='https://certainly.isnot.org/pip/',
+                    default='',
                     help="server from which to pull candidate release packages")
 cl_args = parser.parse_args()
 
diff --git a/scripts/test_apache2.sh b/scripts/test_apache2.sh
index 7507bb47b..583f1f911 100755
--- a/scripts/test_apache2.sh
+++ b/scripts/test_apache2.sh
@@ -49,7 +49,8 @@ else
   exit 1
 fi
 
-venv/bin/letsencrypt -v --debug --text --agree-dev-preview --agree-tos \
+bootstrap/dev/venv.sh
+sudo venv/bin/letsencrypt -v --debug --text --agree-dev-preview --agree-tos \
                    --renew-by-default --redirect --register-unsafely-without-email \
                    --domain $PUBLIC_HOSTNAME --server $BOULDER_URL
 if [ $? -ne 0 ] ; then
@@ -58,7 +59,7 @@ fi
 
 if [ "$OS_TYPE" = "ubuntu" ] ; then
     export LETSENCRYPT="$HOME/.local/share/letsencrypt/bin/letsencrypt"
-    venv/bin/tox apacheconftest
+    venv/bin/tox -e apacheconftest
 else
     echo Not running hackish apache tests on $OS_TYPE
 fi