From a76020f6bc6d914c2c1e432f9cec28d68a1f8d79 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 15 May 2019 15:44:25 -0700
Subject: [PATCH 1/2] Add encrypted private key.

---
 tests/letstest/travis-test-farm.pem.enc | Bin 0 -> 1680 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/letstest/travis-test-farm.pem.enc

diff --git a/tests/letstest/travis-test-farm.pem.enc b/tests/letstest/travis-test-farm.pem.enc
new file mode 100644
index 0000000000000000000000000000000000000000..f8b1d576c606b37bdbe3a83eec29cc800ee8a91d
GIT binary patch
literal 1680
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
a%WfOSZ){XuKA^#teVPiU=pgUZO(h@Xfi~O#

literal 0
HcmV?d00001


From 6e466c974007bca1cb15fcbcea08a0effbf2b9f3 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 15 May 2019 18:02:40 -0700
Subject: [PATCH 2/2] Add test farm tests to tox and travis.

---
 .travis.yml | 10 ++++++++++
 tox.ini     | 31 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3a054b419..003146ad6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,6 +94,16 @@ matrix:
       <<: *not-on-master
 
     # Extended test suite on cron jobs and pushes to tested branches other than master
+    - python: "2.7"
+      env:
+        - TOXENV=travis-test-farm-tests-part1
+        - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
+      <<: *extended-test-suite
+    - python: "2.7"
+      env:
+        - TOXENV=travis-test-farm-tests-part2
+        - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
+      <<: *extended-test-suite
     - python: "3.7"
       dist: xenial
       env: TOXENV=py37 CERTBOT_NO_PIN=1
diff --git a/tox.ini b/tox.ini
index 7f2c18d38..db8caf225 100644
--- a/tox.ini
+++ b/tox.ini
@@ -274,3 +274,34 @@ commands =
         --acme-server={env:ACME_SERVER:pebble}
 passenv = DOCKER_*
 setenv = {[testenv:py27-oldest]setenv}
+
+[testenv:travis-test-farm-tests-base]
+changedir = tests/letstest
+commands =
+    openssl aes-256-cbc -K {env:encrypted_9a387195a62e_key} -iv {env:encrypted_9a387195a62e_iv} -in travis-test-farm.pem.enc -out travis-test-farm.pem -d
+deps = -rtests/letstest/requirements.txt
+passenv = AWS_*
+setenv = AWS_DEFAULT_REGION=us-east-1
+whitelist_externals = openssl
+
+[testenv:travis-test-farm-tests-part1]
+changedir = {[testenv:travis-test-farm-tests-base]changedir}
+commands =
+    {[testenv:travis-test-farm-tests-base]commands}
+    python multitester.py apache2_targets.yaml travis-test-farm.pem none scripts/test_apache2.sh --fast
+    python multitester.py targets.yaml travis-test-farm.pem none scripts/test_leauto_upgrades.sh --fast
+deps = {[testenv:travis-test-farm-tests-base]deps}
+passenv = {[testenv:travis-test-farm-tests-base]passenv}
+setenv = {[testenv:travis-test-farm-tests-base]setenv}
+whitelist_externals = {[testenv:travis-test-farm-tests-base]whitelist_externals}
+
+[testenv:travis-test-farm-tests-part2]
+changedir = {[testenv:travis-test-farm-tests-base]changedir}
+commands =
+    {[testenv:travis-test-farm-tests-base]commands}
+    python multitester.py targets.yaml travis-test-farm.pem none scripts/test_letsencrypt_auto_certonly_standalone.sh --fast
+    python multitester.py targets.yaml travis-test-farm.pem none scripts/test_sdists.sh --fast
+deps = {[testenv:travis-test-farm-tests-base]deps}
+passenv = {[testenv:travis-test-farm-tests-base]passenv}
+setenv = {[testenv:travis-test-farm-tests-base]setenv}
+whitelist_externals = {[testenv:travis-test-farm-tests-base]whitelist_externals}