From e518bfe14bc508c3e17053f8c312b8a4cfa55ff5 Mon Sep 17 00:00:00 2001 From: regilero Date: Wed, 16 Nov 2016 14:23:20 +0100 Subject: [PATCH 1/6] try an nginx docker run --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 381351a..cf63e3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,17 @@ +sudo: required +services: + - docker language: python python: - "2.7" - "3.4" - "3.5" +env: + - HTTPWOOKIEE_CONF=tests/docker/nginx/latest/config.ini +before_install: + - tests/docker/nginx/build.sh # command to install dependencies install: - pip install tox-travis # command to run tests -script: tox +script: httpwookiee.py -V From e1e2805b8c8bf174726f602caa73e6f289ce84d2 Mon Sep 17 00:00:00 2001 From: regilero Date: Wed, 16 Nov 2016 14:27:43 +0100 Subject: [PATCH 2/6] docker nginx build: cd in script directory --- tests/docker/nginx/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/nginx/build.sh b/tests/docker/nginx/build.sh index 03509b5..3838eaa 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/ From c10a0cf2e4729f98c8e4ccb912b840f96188152b Mon Sep 17 00:00:00 2001 From: regilero Date: Wed, 16 Nov 2016 19:22:24 +0100 Subject: [PATCH 3/6] nginx build, set pwd back at the end --- tests/docker/nginx/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/nginx/build.sh b/tests/docker/nginx/build.sh index 3838eaa..0ea6bba 100755 --- a/tests/docker/nginx/build.sh +++ b/tests/docker/nginx/build.sh @@ -29,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 - From 94fa413a5704b86bc92328849abc30ec5129d6e5 Mon Sep 17 00:00:00 2001 From: regilero Date: Wed, 16 Nov 2016 19:28:53 +0100 Subject: [PATCH 4/6] travis.yml with reduced python deps and no tox --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf63e3e..eff4b7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,12 @@ services: - docker language: python python: - - "2.7" - - "3.4" - "3.5" -env: - - HTTPWOOKIEE_CONF=tests/docker/nginx/latest/config.ini before_install: - tests/docker/nginx/build.sh # command to install dependencies install: - pip install tox-travis + - pip install -e . # command to run tests -script: httpwookiee.py -V +script: demo.sh From d0af72bcc7afeda59d05c5e62d0f1a0e65178031 Mon Sep 17 00:00:00 2001 From: regilero Date: Wed, 16 Nov 2016 19:29:07 +0100 Subject: [PATCH 5/6] demo.sh script --- demo.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 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 From 154f4c7e6816ea7409ab127a5bb7e3d65f0a1466 Mon Sep 17 00:00:00 2001 From: regilero Date: Wed, 16 Nov 2016 19:51:54 +0100 Subject: [PATCH 6/6] find the demo script --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eff4b7f..04dec56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,6 @@ before_install: install: - pip install tox-travis - pip install -e . + - chmod ugo+x demo.sh # command to run tests -script: demo.sh +script: ./demo.sh