Run coverage only when activated

jenshnielsen · jenshnielsen · commit 2ce262e03bfe · 2015-11-15T12:41:40.000Z
Run one of the jobs without multiprocesses and run coverage with this. The covarage plugin does not work well with multiprocessing
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,7 @@ env:
     - PANDAS=
     - NPROC=2
     - TEST_ARGS=--no-pep8
+    - NOSE_ARGS="--processes=$NPROC --process-timeout=300"
 
 language: python
 
@@ -38,7 +39,7 @@ matrix:
       env: MOCK=mock NUMPY=numpy==1.6
     - python: 3.4
     - python: 3.5
-      env: PANDAS=pandas
+      env: PANDAS=pandas NOSE_ARGS=--with-coverage
     - python: 3.5
       env: TEST_ARGS=--pep8
     - python: 2.7
@@ -102,7 +103,7 @@ script:
   - |
     if [[ $BUILD_DOCS == false ]]; then
       export MPL_REPO_DIR=$PWD  # needed for pep8-conformance test of the examples
-      gdb -return-child-result -batch -ex r -ex bt --args python tests.py --processes=$NPROC --process-timeout=300 $TEST_ARGS
+      gdb -return-child-result -batch -ex r -ex bt --args python tests.py $NOSE_ARGS $TEST_ARGS
     else
       cd doc
       python make.py html --small --warningsaserrors
@@ -163,8 +164,6 @@ after_success:
         fi
       fi
   fi
-  if [[ $BUILD_DOCS == false && $TEST_ARGS != "--pep8" ]]; then
-     # account for us running the test out-of-repo and coveralls expects in-repo
-     # tests
+  if [[ $NOSE_ARGS="--with-coverage" ]]; then
      coveralls
   fi
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1529,6 +1529,13 @@ def _get_extra_test_plugins():
     return [KnownFailure, attrib.Plugin]
 
 
+def _get_nose_env():
+    env = {'NOSE_COVER_PACKAGE': 'matplotlib',
+           'NOSE_COVER_HTML': 1,
+           'NOSE_COVER_NO_PRINT': 1}
+    return env
+
+
 def test(verbosity=1):
     """run the matplotlib test suite"""
     _init_tests()
diff --git a/tests.py b/tests.py
@@ -23,10 +23,7 @@
 def run(extra_args):
     from nose.plugins import multiprocess
 
-    env = {"NOSE_WITH_COVERAGE": 1,
-           'NOSE_COVER_PACKAGE': 'matplotlib',
-           'NOSE_COVER_HTML': 1,
-           'NOSE_COVER_NO_PRINT': 1}
+    env = matplotlib._get_nose_env()
 
     matplotlib._init_tests()
 
