[ci] Fix coverage run

.gitlab-ci.yml

@@ -8,15 +8,15 @@ py27-linux:
   - unset TMPDIR
   - cd src/cpulimit && make && cd -
   - cd bin && ln -s ../src/cpulimit/src/cpulimit . && cd -
-  - export NOSE_WITH_COVERAGE=1
-  - export NOSE_COVER_PACKAGE=beat.web
   - export COVERAGE_FILE=.coverage.django
-  - ./bin/django test --settings=beat.web.settings.test -v 2
+  - ./bin/coverage run --source='./beat/web' ./bin/django test --settings=beat.web.settings.test -v 2
   - export BEAT_CMDLINE_TEST_PLATFORM=django://beat.web.settings.test
   - export COVERAGE_FILE=.coverage.cmdline
+  - export NOSE_WITH_COVERAGE=1
+  - export NOSE_COVER_PACKAGE=beat.web
   - ./bin/nosetests -sv beat.cmdline
   - unset COVERAGE_FILE
-  - ./bin/coverage combine
+  - ./bin/coverage combine .coverage.django .coverage.cmdline
   - ./bin/coverage report
   - ./bin/sphinx-apidoc --separate -d 2 --output=doc/api/api beat beat/web/*/migrations beat/web/*/tests
   - ./bin/sphinx-build doc/api html/api
@@ -34,15 +34,15 @@ py27-macosx:
   - ./bin/python --version
   - cd src/cpulimit && make && cd -
   - cd bin && ln -s ../src/cpulimit/src/cpulimit . && cd -
-  - export NOSE_WITH_COVERAGE=1
-  - export NOSE_COVER_PACKAGE=beat.web
   - export COVERAGE_FILE=.coverage.django
-  - ./bin/django test --settings=beat.web.settings.test -v 2
+  - ./bin/coverage run --source='./beat/web' ./bin/django test --settings=beat.web.settings.test -v 2
   - export BEAT_CMDLINE_TEST_PLATFORM=django://beat.web.settings.test
   - export COVERAGE_FILE=.coverage.cmdline
+  - export NOSE_WITH_COVERAGE=1
+  - export NOSE_COVER_PACKAGE=beat.web
   - ./bin/nosetests -sv beat.cmdline
   - unset COVERAGE_FILE
-  - ./bin/coverage combine
+  - ./bin/coverage combine .coverage.django .coverage.cmdline
   - ./bin/coverage report
   - ./bin/sphinx-apidoc --separate -d 2 --output=doc/api/api beat beat/web/*/migrations beat/web/*/tests
   - ./bin/sphinx-build doc/api html/api