Merge pull request #193 from loles/fix-coverage

Run py.test from solar dir
2015-09-24 16:21:43 +02:00 · 2015-09-24 16:21:43 +02:00 · 490e7bd312
commit 490e7bd312
parent 2035987f3d fe661ef114
2 changed files with 3 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -7,4 +7,4 @@ script:
 services:
    - redis-server
 after_success:
-    cd solar/solar && coveralls
+    cd solar && coveralls
--- a/run_tests.sh
+++ b/run_tests.sh
@ -31,6 +31,6 @@ fi

 pip install -r solar/test-requirements.txt --download-cache=/tmp/$JOB_NAME

-pushd solar/solar
+pushd solar

-PYTHONPATH=$WORKSPACE/solar CONFIG_FILE=$CONFIG_FILE py.test --cov=solar -s test/
+PYTHONPATH=$WORKSPACE/solar CONFIG_FILE=$CONFIG_FILE py.test --cov=solar -s solar