From 82f994b23e853a7b817bd741ecc11cb1bf60f75b Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 7 Jan 2019 16:19:44 -0800
Subject: [PATCH] Start boulder for tox when needed.

---
 .travis.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2b8eafc13..37ddb9e68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,10 @@ matrix:
       before_install:
       addons:
     - python: "2.7"
-      env: TOXENV=apacheconftest
+      env:
+        - ACME_SERVER_URI="http://localhost:4000/directory"
+        - BOULDER_FOR_TOX=1
+        - TOXENV=apacheconftest
       sudo: required
     - python: "2.7"
       env: TOXENV=nginxroundtrip
@@ -92,8 +95,10 @@ addons:
 
 install: "travis_retry $(command -v pip || command -v pip3) install codecov tox"
 script:
+    - '[ -z "${BOULDER_FOR_TOX+x}" ] || travis_retry tests/boulder-fetch.sh'
     - travis_retry tox
-    - '[ -z "${BOULDER_INTEGRATION+x}" ] || (travis_retry tests/boulder-fetch.sh && tests/tox-boulder-integration.sh)'
+    # If BOULDER_INTEGRATION is set, run integration tests. If BOULDER_FOR_TOX isn't set, we still need to start boulder.
+    - '[ -z "${BOULDER_INTEGRATION+x}" ] || ( ( [ -n "${BOULDER_FOR_TOX+x}" ] || travis_retry tests/boulder-fetch.sh ) && tests/tox-boulder-integration.sh)'
 
 after_success: '[ "$TOXENV" == "py27-cover" ] && codecov'