Skip to content

Fixes for 'XFAIL' in pytest 4.1.2 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2019
Merged

Fixes for 'XFAIL' in pytest 4.1.2 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ matrix:
python: 3.6
- env: TOXENV=pypy
python: pypy-5.7.1
- env: TOXENV=py36-pytest-master
python: 3.6
- env: TOXENV=py36-pytest-features
python: 3.6
- env:
- TOXENV=push
- secure: "AEAcy7+XgLUgpW7T8Qccmf39su1PVVoZEov+v9e1cPXdUEvZK2C96AdrHFIsc4J5x8kfU7doUM6sxxaLxVPNR0nyxbTckRq3r70YNlCn43VzyCHzAHQ4pZI/Pr+ys6jlAjXQjCfWrm1ttS0X7zyuBSJwRn7mnKkzKt19QHa8AoXD2hx78AjvVkHlLKm/TKBPCcPbAyTZjfaMsaSBmgyjv8l6q+Hw2E6j20M2FsjGIVtucV1zGUwYjZQSCQjzdzZUCjPYfFuUfV+0/UFCUe1dGvsA/hc3G9ZBN4CYfPNQzwB0wqaTyaR9aQVyDj2QRpYu2Nl0O4SPjmh5xOBJGQc6OjjqrlRrL7BVF+ZvfdwUe1Tf8fj3iC2tNIb1qywZuFVF5xmVsVo23Cm2gvnZdaCk48PAGXi555icBDjpzfypO/0PUANyx26rmbJ/Dadc/802aoCAx8L/BapO7efidT+TYtpW9WEa5VqnNiLMth7oJAacTGNvdoOxXLZV91gS2mofcPNC2x5BWu5/SM3mxoo8MVzF0PEXarLRaE6M8aHRAEawJfMwtyOCypDD018AjTYw+ca7eSV/f7yU8SQuRQxfEanVN1LN9DeBJ0L28DQxC7+lwosdbxQd3SxgPjWbGS2LobCTZ9+gJAWr8ohTK8uXZl3amY6Ve04sGuC0R3vWnQk="
Expand Down
2 changes: 1 addition & 1 deletion pygments_pytest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def filename_line(self, match):
'progress_line': [
(r'^[^ ]+ (?=[^ \n]+ +\[)', pygments.token.Text),
(r'PASSED|\.', Color.Green),
(r'SKIPPED|XPASS|xfail|s|X|x', Color.Yellow),
(r'SKIPPED|XPASS|XFAIL|xfail|s|X|x', Color.Yellow),
(r'ERROR|FAILED|E|F', Color.Red),
(r'\[ *\d+%\]', Color.Cyan),
(r' +', pygments.token.Text),
Expand Down
12 changes: 11 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
# These should match the travis env list
envlist = py27,py35,py36,pypy
envlist = py27,py35,py36,pypy,py36-pytest-master,py36-pytest-features

[testenv]
deps = -rrequirements-dev.txt
Expand All @@ -11,6 +11,16 @@ commands =
pre-commit install -f --install-hooks
pre-commit run --all-files

[testenv:py36-pytest-master]
commands =
pip install --upgrade git+https://github.com/pytest-dev/pytest@master
{[testenv]commands}

[testenv:py36-pytest-features]
commands =
pip install --upgrade git+https://github.com/pytest-dev/pytest@features
{[testenv]commands}

[testenv:push]
passenv = TRAVIS_* GH_TOKEN
commands =
Expand Down