From 0cd795b157ed768b4566c40c07639aec46e996b0 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 7 Apr 2017 18:06:38 -0400 Subject: [PATCH 1/2] fix(CI): add selenium to travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d570e593..40c07ac8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ script: - python -m pytest plugins/CryptMessage/Test - python -m pytest src/Test --cov=src --cov-config src/Test/coverage.ini before_install: - - pip install -U pytest mock pytest-cov + - pip install -U pytest mock pytest-cov selenium - pip install codecov - pip install coveralls after_success: @@ -18,4 +18,4 @@ after_success: - coveralls --rcfile=src/Test/coverage.ini cache: directories: - - $HOME/.cache/pip \ No newline at end of file + - $HOME/.cache/pip From 41aa15ec26efd669348aea15c037e78ee7dceff4 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Sat, 8 Apr 2017 12:57:58 -0400 Subject: [PATCH 2/2] fix(CI/test): start client with docker image --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 40c07ac8..7ee13b5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: python python: - 2.7 +services: + - docker install: - pip install -U pip wheel - pip install -r requirements.txt @@ -13,6 +15,7 @@ before_install: - pip install -U pytest mock pytest-cov selenium - pip install codecov - pip install coveralls + - docker run -d -v $PWD:/root/data -p 15441:15441 -p 127.0.0.1:43110:43110 nofish/zeronet after_success: - codecov - coveralls --rcfile=src/Test/coverage.ini