From f5ae9597c43a4d388417b78b06f2ce21c91888b7 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sun, 2 Dec 2018 16:37:26 +0530 Subject: [PATCH] Disable Mercurial Tests on Travis --- tests/lib/__init__.py | 7 +++++++ tox.ini | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index b63b4510f..ad1ceb18d 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -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://github.com/pypa/pip/issues/6057" + )) + return pytest.mark.mercurial(need_executable( 'Mercurial', ('hg', 'version') )(fn)) diff --git a/tox.ini b/tox.ini index 7e63efd87..84c6970ec 100644 --- a/tox.ini +++ b/tox.ini @@ -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.