Wrangle things to actually run in travis

This commit is contained in:
Peter Eckersley 2015-12-18 00:17:22 -08:00
parent a819ee146d
commit 7a16e2e248
3 changed files with 11 additions and 6 deletions

View file

@ -19,11 +19,11 @@ env:
- GOPATH=/tmp/go
- PATH=$GOPATH/bin:$PATH
matrix:
- TOXENV=py26 BOULDER_INTEGRATION=1
- TOXENV=py27 BOULDER_INTEGRATION=1
- TOXENV=lint
- TOXENV=cover
- TOXENV=hackishapachetest
# - TOXENV=py26 BOULDER_INTEGRATION=1
# - TOXENV=py27 BOULDER_INTEGRATION=1
# - TOXENV=lint
# - TOXENV=cover
# Only build pushes to the master branch, PRs, and branches beginning with
@ -60,6 +60,9 @@ addons:
- openssl
# For Boulder integration testing
- rsyslog
# for hackishapachetest
- realpath
- apache2
install: "travis_retry pip install tox coveralls"
script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/travis-integration.sh)'

View file

@ -51,6 +51,7 @@ trap CleanupExit INT
for f in *.conf ; do
echo -n testing "$f"...
Setup
echo running from $PWD
RESULT=`echo c | sudo "$LETSENCRYPT" --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
if echo $RESULT | grep -Eq \("Please specify --domains"\|"mod_macro is not yet"\) ; then
echo passed

View file

@ -69,8 +69,9 @@ commands =
pylint --rcfile=.pylintrc letshelp-letsencrypt/letshelp_letsencrypt
[testenv:hackishapachetest]
basepython = python2.7
#basepython = python2.7
setenv =
LETSENCRYPT=letsencrypt
LETSENCRYPT=/home/travis/build/letsencrypt/letsencrypt/.tox/hackishapachetest/bin/letsencrypt
commands =
pip install -e acme -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
sudo ./letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test