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.

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

Disable Mercurial Tests on Travis #6059

Merged
merged 1 commit into from
Dec 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions tests/lib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,13 @@ def need_bzr(fn):


def need_mercurial(fn):
# Remove once things get fixed properly.
if os.environ.get("TRAVIS") == "true":
return pytest.mark.skip(reason=(
"Travis CI's mercurial is outdated: "
"https:/pypa/pip/issues/6057"
))

return pytest.mark.mercurial(need_executable(
'Mercurial', ('hg', 'version')
)(fn))
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ envlist =
pip = python {toxinidir}/tools/tox_pip.py

[testenv]
passenv = CI GIT_SSL_CAINFO
# NOTE: remove TRAVIS once #6057 is fixed.
passenv = CI TRAVIS GIT_SSL_CAINFO
setenv =
# This is required in order to get UTF-8 output inside of the subprocesses
# that our tests use.
Expand Down