diff --git a/.travis.yml b/.travis.yml index 0db89c17ee..373d69ec66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_install: # install phantomjs/casperjs - ./tests/install-deps.sh script: - - ./tests/run-tests.sh init && ./tests/run-tests.sh run + - ./tests/seahubtests.sh init && ./tests/seahubtests.sh runserver && ./tests/seahubtests.sh test env: - CCNET_CONF_DIR=/tmp/ccnet SEAFILE_CONF_DIR=/tmp/seafile-data install: diff --git a/tests/run-tests.sh b/tests/seahubtests.sh similarity index 96% rename from tests/run-tests.sh rename to tests/seahubtests.sh index 0b864aac04..a22e571023 100755 --- a/tests/run-tests.sh +++ b/tests/seahubtests.sh @@ -39,8 +39,10 @@ case $1 in "init") init ;; - "run") + "runserver") start_seahub + ;; + "test") run_tests ;; *)