Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Flatland
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
yoogottamk
Flatland
Commits
35f5af7b
Commit
35f5af7b
authored
5 years ago
by
hagrid67
Browse files
Options
Downloads
Patches
Plain Diff
try using xvfb-run inside Makefile for coverage (which runs py.test)
and in tox.ini for [testenv] which runs py.test
parent
1fdae873
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+1
-8
1 addition, 8 deletions
Makefile
tox.ini
+2
-2
2 additions, 2 deletions
tox.ini
with
3 additions
and
10 deletions
Makefile
+
1
−
8
View file @
35f5af7b
...
...
@@ -53,22 +53,15 @@ clean-test: ## remove test and coverage artifacts
lint
:
##
check style with flake8
flake8 flatland tests
test
:
export DISPLAY = :0
test
:
##
run tests quickly with the default Python
echo
"
$$
DISPLAY"
py.test
jw
:
export DISPLAY = :0.0
jw
:
echo
"
$$
DISPLAY"
py.test
test-all
:
##
run tests on every Python version with tox
tox
coverage
:
##
check code coverage quickly with the default Python
coverage run
--source
flatland
-m
pytest
xvfb-run
coverage run
--source
flatland
-m
pytest
coverage report
-m
coverage html
$(
BROWSER
)
htmlcov/index.html
...
...
This diff is collapsed.
Click to expand it.
tox.ini
+
2
−
2
View file @
35f5af7b
...
...
@@ -28,7 +28,6 @@ commands = make coverage
[testenv]
setenv
=
PYTHONPATH
=
{toxinidir}
DISPLAY
=
:0
deps
=
-r{toxinidir}/requirements_dev.txt
; If you want to make tox run the tests with the same versions, create a
...
...
@@ -36,6 +35,7 @@ deps =
; -r{toxinidir}/requirements.txt
commands
=
pip
install
-U
pip
py.test
--basetemp
=
{envtmpdir}
sh
-c
'echo
DISPLAY:
$DISPLAY'
xvfb-run
py.test
--basetemp
=
{envtmpdir}
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