Skip to content

Commit

Permalink
Get le-auto tests running on Travis.
Browse files Browse the repository at this point in the history
  • Loading branch information
erikrose committed Jan 8, 2016
1 parent f2586fb commit 5512838
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: python

services:
- docker
- rabbitmq
- mariadb
# apacheconftest
Expand All @@ -22,6 +23,7 @@ env:
matrix:
- TOXENV=py26 BOULDER_INTEGRATION=1
- TOXENV=py27 BOULDER_INTEGRATION=1
- TOXENV=le_auto
- TOXENV=lint
- TOXENV=cover
# Disabled for now due to requiring sudo -> causing more boulder integration
Expand All @@ -37,8 +39,7 @@ branches:
- master
- /^test-.*$/

# container-based infrastructure
sudo: false
sudo: required

addons:
# make sure simplehttp simple verification works (custom /etc/hosts)
Expand Down
2 changes: 1 addition & 1 deletion letsencrypt-auto-source/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ COPY . /home/lea/letsencrypt/letsencrypt-auto-source
USER lea
WORKDIR /home/lea

CMD ["nosetests", "-s", "letsencrypt/letsencrypt-auto-source/tests"]
CMD ["nosetests", "-v", "-s", "letsencrypt/letsencrypt-auto-source/tests"]
2 changes: 1 addition & 1 deletion letsencrypt-auto-source/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Tests for letsencrypt-auto
For now, run these by saying... ::
Run these locally by saying... ::
./build.py && docker build -t lea . && docker run --rm -t -i lea
Expand Down
10 changes: 10 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,13 @@ setenv =
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/apache-conf-test --debian-modules

[testenv:le_auto]
# At the moment, this tests under Python 2.7 only, as only that version is
# readily available on the Trusty Docker image.
commands =
docker build -t lea letsencrypt-auto-source
docker run --rm -t -i lea
whitelist_externals =
docker
passenv = DOCKER_*

0 comments on commit 5512838

Please sign in to comment.