Skip to content
Snippets Groups Projects
Commit a76d0b87 authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

CI coverage reporting was wrong. Hopefully this will fix it?

parent 1cdf70a5
No related branches found
No related tags found
No related merge requests found
...@@ -75,6 +75,7 @@ stages: ...@@ -75,6 +75,7 @@ stages:
variables: variables:
UPSTREAM_PROJECT: "fsl/fslpy" UPSTREAM_PROJECT: "fsl/fslpy"
UPSTREAM_URL: "git@git.fmrib.ox.ac.uk" UPSTREAM_URL: "git@git.fmrib.ox.ac.uk"
TEST_OPTS: "--cov-report= --cov-append"
#################################### ####################################
...@@ -263,9 +264,9 @@ variables: ...@@ -263,9 +264,9 @@ variables:
# We run some tests under xvfb-run # We run some tests under xvfb-run
# because they invoke wx. Sleep in # because they invoke wx. Sleep in
# between, otherwise xvfb gets upset. # between, otherwise xvfb gets upset.
- xvfb-run python setup.py test --addopts="tests/test_async.py" - xvfb-run python setup.py test --addopts="$TEST_OPTS tests/test_async.py"
- sleep 5 - sleep 5
- xvfb-run python setup.py test --addopts="tests/test_platform.py" - xvfb-run python setup.py test --addopts="$TEST_OPTS tests/test_platform.py"
# We run the immv/imcpy tests as the nobody # We run the immv/imcpy tests as the nobody
# user because some tests expect permission # user because some tests expect permission
...@@ -274,10 +275,10 @@ variables: ...@@ -274,10 +275,10 @@ variables:
# this directory writable by anybody (which, # this directory writable by anybody (which,
# unintuitively, includes nobody) # unintuitively, includes nobody)
- chmod -R a+w `pwd` - chmod -R a+w `pwd`
- su -s /bin/bash -c "python setup.py test --addopts='tests/test_immv_imcp.py'" nobody - su -s /bin/bash -c 'python setup.py test --addopts="$TEST_OPTS tests/test_immv_imcp.py"' nobody
# All other tests can be run as normal # All other tests can be run as normal
- python setup.py test --addopts="--ignore=tests/test_async.py --ignore=tests/test_platform.py --ignore=tests/test_immv_imcp.py" - python setup.py test --addopts="$TEST_OPTS --ignore=tests/test_async.py --ignore=tests/test_platform.py --ignore=tests/test_immv_imcp.py"
- python -m coverage report - python -m coverage report
......
...@@ -6,4 +6,4 @@ universal=1 ...@@ -6,4 +6,4 @@ universal=1
[tool:pytest] [tool:pytest]
testpaths = tests testpaths = tests
addopts = -s -v --niters=50 --cov=fsl addopts = -s -v --niters=50 --cov=fsl --cov-report=html
\ No newline at end of file \ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment