From 5ca0d5d83bd3030778d4f0f2c4d2a1a14649d557 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Thu, 16 May 2019 12:53:02 -0700 Subject: [PATCH] Split tests and run them in travis. --- .travis.yml | 15 +++++++++++++++ tests/letstest/travis.sh | 13 ------------- tox.ini | 30 ++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 13 deletions(-) delete mode 100755 tests/letstest/travis.sh diff --git a/.travis.yml b/.travis.yml index e9757d3b3..d803b40b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,6 +99,21 @@ matrix: - TOXENV=travis-test-apache2 - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw=" <<: *extended-test-suite + - python: "2.7" + env: + - TOXENV=travis-test-leauto-upgrades + - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw=" + <<: *extended-test-suite + - python: "2.7" + env: + - TOXENV=travis-test-letsencrypt-auto-certonly-standalone + - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw=" + <<: *extended-test-suite + - python: "2.7" + env: + - TOXENV=travis-test-sdists + - 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/tests/letstest/travis.sh b/tests/letstest/travis.sh deleted file mode 100755 index 747985295..000000000 --- a/tests/letstest/travis.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -eux -# -# Runs test farm tests in Travis. -cd $(dirname "$0") - -openssl aes-256-cbc -K $encrypted_9a387195a62e_key -iv $encrypted_9a387195a62e_iv -in travis-test-farm.pem.enc -out travis-test-farm.pem -d - -python multitester.py apache2_targets.yaml ./travis-test-farm.pem none scripts/test_apache2.sh -for script in test_leauto_upgrades.sh test_letsencrypt_auto_certonly_standalone.sh test_sdists.sh; do - # Sleep after each test to give AWS time to terminate instances. - sleep 30s - python multitester.py targets.yaml ./travis-test-farm.pem none "scripts/$script" -done diff --git a/tox.ini b/tox.ini index d19867cef..f2796f11a 100644 --- a/tox.ini +++ b/tox.ini @@ -293,3 +293,33 @@ 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-leauto-upgrades] +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_leauto_upgrades.sh +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-letsencrypt-auto-certonly-standalone] +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 +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-sdists] +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_sdists.sh +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}