From 70677b26f31f2206238891f563789e84f45baa9a Mon Sep 17 00:00:00 2001
From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl>
Date: Mon, 20 Mar 2017 19:45:03 +0100
Subject: [PATCH] coverage fixed
---
.gitlab-ci.yml | 5 +++--
README.md | 9 +++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2feffd..3851b9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,14 +10,15 @@ build:
- master
unit_tests:
stage: test
+ coverage: /^TOTAL\s+\d+\s+\d+\s+\d+\s+\d+\s+(\d+)%$/
script:
- - python setup.py nosetests
+ - nosetests --with-coverage
# vagrant_backed_tests
# stage: test
# script:
# - vagrant ssh -c 'sudo shutdown -P +10'
-# - vagrant ssh -c 'cd /vagrant; python setup.py nosetests'
+# - vagrant ssh -c 'cd /vagrant; nosetests --with-coverage'
# before_script:
# - vagrant up
# after_script:
diff --git a/README.md b/README.md
index 89547d8..553365c 100644
--- a/README.md
+++ b/README.md
@@ -28,10 +28,7 @@ This is a generic scaffold for Python projects that use:
Vagrant environment
13. Set up a repository on GitLab
14. Ensure you have _master_ permission on this repository
-15. Set `^TOTAL\s+\d+\s+\d+\s+\d+\s+\d+\s+(\d+)%$` in
- _Settings>CI/CD Pipelines>Test coverage parsing_ for GitLab to display
- test coverage data
-16. `git init`
-17. Add suitable remotes, commit the data, push to repo
-18. Done!
+15. `git init`
+16. Add suitable remotes, commit the data, push to repo
+17. Done!
--
GitLab