diff --git a/.travis.yml b/.travis.yml index 381351a..04dec56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,15 @@ +sudo: required +services: + - docker language: python python: - - "2.7" - - "3.4" - "3.5" +before_install: + - tests/docker/nginx/build.sh # command to install dependencies install: - pip install tox-travis + - pip install -e . + - chmod ugo+x demo.sh # command to run tests -script: tox +script: ./demo.sh diff --git a/demo.sh b/demo.sh new file mode 100644 index 0000000..2974109 --- /dev/null +++ b/demo.sh @@ -0,0 +1,12 @@ +#!/bin/bash +echo +echo "--- Runing Nginx \"latests\" tests ----" +echo +export HTTPWOOKIEE_CONF=tests/docker/nginx/latest/config.ini +./httpwookiee.py -V + +echo +echo "--- Runing Nginx \"stable\" tests ----" +echo +export HTTPWOOKIEE_CONF=tests/docker/nginx/stable/config.ini +./httpwookiee.py -V diff --git a/tests/docker/nginx/build.sh b/tests/docker/nginx/build.sh index 03509b5..0ea6bba 100755 --- a/tests/docker/nginx/build.sh +++ b/tests/docker/nginx/build.sh @@ -1,5 +1,6 @@ #!/bin/bash set -e +cd "$(dirname "$0")" echo "******* copying static resources here (yep, Dockerfile hack...)" cp -ar ../../../httpwookiee/static ./latest/ cp -ar ../../../httpwookiee/static ./stable/ @@ -28,3 +29,4 @@ echo "******* docker ps" docker ps -a # if you want to edit files in a running docker (for tests, do not forget to getyour copy back in conf dir) #docker run -i -t --rm --volumes-from wrpnginx_latest --name wookieenginxfiles debian /bin/bash +cd -