From 5d85012087ac55e7943d6a67f8086bc6877b2747 Mon Sep 17 00:00:00 2001 From: Pauli Virtanen Date: Sun, 4 Feb 2018 18:16:42 +0100 Subject: [PATCH 1/2] CI: show verbose test output --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30f56a1e1..48bffca1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ install: - $TRAVIS_PYTHON setup.py build_ext -i script: - - $TRAVIS_PYTHON -m pytest --timeout=360 -l $COVERAGE test + - $TRAVIS_PYTHON -m pytest --timeout=360 -l $COVERAGE test -vv after_script: - if [[ "$COVERAGE" != '' ]]; then diff --git a/appveyor.yml b/appveyor.yml index 0012d9ab9..05e15d856 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,7 +57,7 @@ install: build: false test_script: - - "python -m pytest --timeout=360 -l --basetemp=%APPVEYOR_BUILD_FOLDER%\\tmp test" + - "python -m pytest --timeout=360 -l --basetemp=%APPVEYOR_BUILD_FOLDER%\\tmp test -vv" after_build: # Clear up pip cache From 0d1c60cfffa55db6c08813c04437cdbd1cbe125a Mon Sep 17 00:00:00 2001 From: Pauli Virtanen Date: Sun, 4 Feb 2018 18:51:40 +0100 Subject: [PATCH 2/2] TST: fix test_conda_channel_addition vs. conda changes --- test/test_environment.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_environment.py b/test/test_environment.py index abf911fe2..5358225b3 100644 --- a/test/test_environment.py +++ b/test/test_environment.py @@ -509,8 +509,8 @@ def test_conda_channel_addition(tmpdir, '--json'])) json_package_list = json.loads(out_str) for installed_package in json_package_list: - # ignore default-only package - if installed_package['name'] == 'vs2008_runtime': + # check only explicitly installed packages + if installed_package['name'] not in ('python', 'pip', 'wheel'): continue assert installed_package['channel'] == expected_channel