From 63ef9ff508e3caadaee1fe3361f17f7acc50a9ab Mon Sep 17 00:00:00 2001 From: justinpotts Date: Tue, 9 Aug 2016 13:18:57 -0700 Subject: [PATCH 1/2] Add tox command to run tests in .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d0afff2d74b..eb13fe84b1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,5 +16,6 @@ before_script: - if [ $GUI ]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start && sleep 3; fi script: - npm run $TASK +- tox -e discopane-ui-tests -- --base-url http://localhost:4000 addons: firefox: latest From 975210fe3f87ef41cbeb5e45bd3c7aaf24d5f725 Mon Sep 17 00:00:00 2001 From: justinpotts Date: Thu, 11 Aug 2016 08:57:51 -0700 Subject: [PATCH 2/2] Update tox commands in .travis.yml --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb13fe84b1d..98ad7031060 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ env: - TASK=lint - TASK=unittest GUI=1 - TASK=servertest + - TASK=tox TOXENV=discopane-ui-tests cache: directories: - node_modules @@ -15,7 +16,7 @@ before_install: before_script: - if [ $GUI ]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start && sleep 3; fi script: -- npm run $TASK -- tox -e discopane-ui-tests -- --base-url http://localhost:4000 +- if [[ $TASK == 'tox' ]]; then tox -- --base-url http://localhost:4000; fi +- if [[ $TASK != 'tox' ]]; then npm run $TASK; fi addons: firefox: latest