Merge pull request #613 from pv/conda-fix

TST: fix conda_channel test failure
airspeed-velocity · Feb 4, 2018 · 55b6dc3 · 55b6dc3
2 parents 6e88ad2 + 0d1c60c
commit 55b6dc3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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

diff --git 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