Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fslpy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michiel Cottaar
fslpy
Commits
a76d0b87
Commit
a76d0b87
authored
7 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+5
-4
5 additions, 4 deletions
.gitlab-ci.yml
setup.cfg
+1
-1
1 addition, 1 deletion
setup.cfg
with
6 additions
and
5 deletions
.gitlab-ci.yml
+
5
−
4
View file @
a76d0b87
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
setup.cfg
+
1
−
1
View file @
a76d0b87
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment