From 20418cdd6899b0ac5c0e7669bdc69ed135594276 Mon Sep 17 00:00:00 2001
From: pdamodaran <pdamodaran@users.noreply.github.com>
Date: Thu, 17 May 2018 09:52:11 -0400
Subject: [PATCH 1/3] Fixed #5859 (#6011)

---
 tests/boulder-fetch.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/boulder-fetch.sh b/tests/boulder-fetch.sh
index fc9cbaae7..d513ec064 100755
--- a/tests/boulder-fetch.sh
+++ b/tests/boulder-fetch.sh
@@ -17,12 +17,6 @@ FAKE_DNS=$(ifconfig docker0 | grep "inet addr:" | cut -d: -f2 | awk '{ print $1}
 [ -z "$FAKE_DNS" ] && echo Unable to find the IP for docker0 && exit 1
 sed -i "s/FAKE_DNS: .*/FAKE_DNS: ${FAKE_DNS}/" docker-compose.yml
 
-# If we're testing against ACMEv2, we need to use a newer boulder config for
-# now. See https://github.com/letsencrypt/boulder#quickstart.
-if [ "$BOULDER_INTEGRATION" = "v2" ]; then
-    sed -i 's/BOULDER_CONFIG_DIR: .*/BOULDER_CONFIG_DIR: test\/config-next/' docker-compose.yml
-fi
-
 docker-compose up -d
 
 set +x  # reduce verbosity while waiting for boulder

From 1be1bd92115101e019d71a23ee14e7bfadf72226 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@users.noreply.github.com>
Date: Thu, 17 May 2018 09:23:05 -0700
Subject: [PATCH 2/3] remove PYTHONPATH (#6016)

---
 tox.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 38d4e6ae1..8c4d6c38d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,7 +58,6 @@ commands =
     {[base]install_and_test} {[base]all_packages}
     python tests/lock_test.py
 setenv =
-    PYTHONPATH = {toxinidir}
     PYTHONHASHSEED = 0
 
 [testenv:py27-oldest]

From 6bf88e6752cf73a7a0a490c5a0ef96621ab21541 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Thu, 17 May 2018 12:35:58 -0700
Subject: [PATCH 3/3] cd before running tests

When importing a module, Python first searches the current directory. See
https://docs.python.org/3/tutorial/modules.html#the-module-search-path. This
means that running something like `import certbot` from the root of the Certbot
repo will use the local Certbot files regardless of the version installed on
the system or virtual environment.

Normally this behavior is fine because the local files are what we want to
test, however, during our "oldest" tests, we test against older versions of our
packages to make sure we're keeping compatibility. To make sure our tests use
the correct versions, this commit has our tests cd to an empty temporary
directory before running tests.

We also had to change the package names given to pytest to be the names used in
Python to import the package rather than the name of the files locally to
accommodate this.
---
 tools/install_and_test.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/install_and_test.sh b/tools/install_and_test.sh
index 59832cbc3..49b677d0e 100755
--- a/tools/install_and_test.sh
+++ b/tools/install_and_test.sh
@@ -12,12 +12,18 @@ else
   pip_install="$(dirname $0)/pip_install_editable.sh"
 fi
 
+temp_cwd=$(mktemp -d)
+trap "rm -rf $temp_cwd" EXIT
+
 set -x
 for requirement in "$@" ; do
   $pip_install $requirement
   pkg=$(echo $requirement | cut -f1 -d\[)  # remove any extras such as [dev]
+  pkg=$(echo "$pkg" | tr - _ )  # convert package names to Python import names
   if [ $pkg = "." ]; then
     pkg="certbot"
   fi
+  cd "$temp_cwd"
   pytest --numprocesses auto --quiet --pyargs $pkg
+  cd ~-
 done