From 63fb53285d16b7a32861badf3ab627430e1f7bb0 Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Tue, 19 Jun 2018 13:49:13 +0200
Subject: [PATCH] coverage fixed (cov set to correct directory). Colonel
omitted
---
.coveragerc | 4 +++-
.gitlab-ci.yml | 2 +-
tests/test_try_me.py | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.coveragerc b/.coveragerc
index 4e1a67de..9cc63f08 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,2 +1,4 @@
[run]
-omit = */Colonel/*
\ No newline at end of file
+omit =
+ */Colonel/*
+ */colonel/*
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bac7087e..1fe2e181 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ test_topfarm_windows: # name the job what we like
test
script: # runs on windows machine due to tag below
- cd tests
- - c:/Anaconda3/envs/pyTopfarm/python.exe -m pytest --cov-report term-missing:skip-covered --cov=topfarm
+ - c:/Anaconda3/envs/pyTopfarm/python.exe -m pytest --cov-report term-missing:skip-covered --cov=../topfarm --cov-config ../.coveragerc
tags: # tag for shared runner on windows machine
- CPAV_old_PC
diff --git a/tests/test_try_me.py b/tests/test_try_me.py
index 098798ff..249317a0 100644
--- a/tests/test_try_me.py
+++ b/tests/test_try_me.py
@@ -14,6 +14,8 @@ def get_try_me_modules():
for _, modname, _ in pkgutil.walk_packages(package.__path__, package.__name__ + '.'):
with warnings.catch_warnings():
warnings.simplefilter("ignore")
+ if 'olonel' in modname:
+ continue
m = importlib.import_module(modname)
if 'try_me' in dir(m):
modules.append(m)
--
GitLab