Skip to content
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

Jump to bottom

Fixed early test failure on new pytest version. #188

Merged
merged 2 commits into from Jan 15, 2017
Merged

Fixed early test failure on new pytest version. #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
070c19f
Fixed early test failure on new pytest version.
apollo13 Jan 14, 2017
3079326
Fixed pytest skips on python 2.6.
apollo13 Jan 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -34,8 +34,8 @@ matrix:
before_install:
- ./.travis/install.sh
install:
- pip install -r requirements-test.txt
- pip install -e .
- pip install -Ur requirements-test.txt
- pip install -Ue .
script: python setup.py test
after_success:
- coveralls
Expand Down
2 changes: 1 addition & 1 deletion tests/core/test_coroutine.py
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@


import pytest
pytest.skip("XXX: This test fails intermittently")
pytest.mark.skip("XXX: This test fails intermittently")

from circuits import Event, Component

Expand Down
2 changes: 1 addition & 1 deletion tests/web/test_servers.py
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@


if pytest.PYVER < (2, 7):
pytest.skip("This test requires Python=>2.7")
pytest.mark.skip("This test requires Python=>2.7")


CERTFILE = path.join(path.dirname(__file__), "cert.pem")
Expand Down