diff --git a/.travis.yml b/.travis.yml index a5d6d8a8588..a40cbb44abb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: python services: + - docker - rabbitmq - mariadb # apacheconftest @@ -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 @@ -37,8 +39,7 @@ branches: - master - /^test-.*$/ -# container-based infrastructure -sudo: false +sudo: required addons: # make sure simplehttp simple verification works (custom /etc/hosts) diff --git a/letsencrypt-auto-source/Dockerfile b/letsencrypt-auto-source/Dockerfile index 0969dfce2b8..667acfe5a7a 100644 --- a/letsencrypt-auto-source/Dockerfile +++ b/letsencrypt-auto-source/Dockerfile @@ -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"] diff --git a/letsencrypt-auto-source/tests/__init__.py b/letsencrypt-auto-source/tests/__init__.py index 13180b5f5d6..45db90444b8 100644 --- a/letsencrypt-auto-source/tests/__init__.py +++ b/letsencrypt-auto-source/tests/__init__.py @@ -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 diff --git a/tox.ini b/tox.ini index dbd6d51fab4..eb43683935d 100644 --- a/tox.ini +++ b/tox.ini @@ -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_* \ No newline at end of file