Merge pull request matplotlib#1951 from mdboom/parallelize_tests

parallelize_tests

Author: mdboom

.travis.yml

@@ -7,16 +7,20 @@ python:
   - 3.3
 
 install:
-  - pip install --use-mirrors nose python-dateutil numpy
+  - pip -q install --use-mirrors nose python-dateutil numpy
   # This is a workaround to install the latest versions of pyparsing,
   # which are not yet available on PyPI
-  - 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ]; then pip install http://sourceforge.net/projects/pyparsing/files/pyparsing/pyparsing-2.0.0/pyparsing-2.0.0.tar.gz; fi'
-  - 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install http://sourceforge.net/projects/pyparsing/files/pyparsing/pyparsing-1.5.7/pyparsing-1.5.7.tar.gz; fi'
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install --use-mirrors PIL; fi
-  - sudo apt-get update && sudo apt-get install inkscape
+  - 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ]; then pip -q install http://sourceforge.net/projects/pyparsing/files/pyparsing/pyparsing-2.0.0/pyparsing-2.0.0.tar.gz; fi'
+  - 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip -q install http://sourceforge.net/projects/pyparsing/files/pyparsing/pyparsing-1.5.7/pyparsing-1.5.7.tar.gz; fi'
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip -q install --use-mirrors PIL; fi
+  - sudo apt-get update && sudo apt-get -qq install inkscape
   - python setup.py install
 
 script:
   - mkdir ../tmp_test_dir
   - cd ../tmp_test_dir
-  - python ../matplotlib/tests.py -sv
+  # The number of processes is hardcoded, because using too many causes the
+  # Travis VM to run out of memory (since so many copies of inkscape and
+  # ghostscript are running at the same time).
+  - echo Testing using 8 processes
+  - python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300

lib/matplotlib/__init__.py

@@ -1172,10 +1172,13 @@ def tk_window_focus():
 
 default_test_modules = [
     'matplotlib.tests.test_agg',
+    'matplotlib.tests.test_arrow_patches',
     'matplotlib.tests.test_artist',
     'matplotlib.tests.test_axes',
-    'matplotlib.tests.test_backend_svg',
+    'matplotlib.tests.test_backend_pdf',
     'matplotlib.tests.test_backend_pgf',
+    'matplotlib.tests.test_backend_qt4',
+    'matplotlib.tests.test_backend_svg',
     'matplotlib.tests.test_basic',
     'matplotlib.tests.test_bbox_tight',
     'matplotlib.tests.test_cbook',
@@ -1196,6 +1199,7 @@ def tk_window_focus():
     'matplotlib.tests.test_path',
     'matplotlib.tests.test_patheffects',
     'matplotlib.tests.test_pickle',
+    'matplotlib.tests.test_png',
     'matplotlib.tests.test_rcparams',
     'matplotlib.tests.test_scale',
     'matplotlib.tests.test_simplification',
@@ -1205,10 +1209,8 @@ def tk_window_focus():
     'matplotlib.tests.test_text',
     'matplotlib.tests.test_ticker',
     'matplotlib.tests.test_tightlayout',
-    'matplotlib.tests.test_triangulation',
     'matplotlib.tests.test_transforms',
-    'matplotlib.tests.test_arrow_patches',
-    'matplotlib.tests.test_backend_qt4',
+    'matplotlib.tests.test_triangulation',
     ]
 
 

lib/matplotlib/testing/compare.py

@@ -9,7 +9,7 @@
 import matplotlib
 from matplotlib.compat import subprocess
 from matplotlib.testing.noseclasses import ImageComparisonFailure
-from matplotlib.testing import image_util, util
+from matplotlib.testing import image_util
 from matplotlib import _png
 from matplotlib import _get_configdir
 from distutils import version
@@ -141,28 +141,16 @@ def convert(old, new):
    return convert
 
 if matplotlib.checkdep_ghostscript() is not None:
-    def make_ghostscript_conversion_command():
-        # FIXME: make checkdep_ghostscript return the command
-        if sys.platform == 'win32':
-            gs = 'gswin32c'
-        else:
-            gs = 'gs'
-        cmd = [gs, '-q', '-sDEVICE=png16m', '-sOutputFile=-']
-
-        process = util.MiniExpect(cmd)
-
-        def do_convert(old, new):
-            process.expect("GS>")
-            process.sendline("(%s) run" % old.replace('\\', '/'))
-            with open(new, 'wb') as fd:
-                process.expect(">>showpage, press <return> to continue<<", fd)
-            process.sendline('')
-
-        return do_convert
-
-    converter['pdf'] = make_ghostscript_conversion_command()
-    converter['eps'] = make_ghostscript_conversion_command()
-
+    if sys.platform == 'win32':
+        gs = 'gswin32c'
+    else:
+        gs = 'gs'
+
+    cmd = lambda old, new: \
+        [gs, '-q', '-sDEVICE=png16m', '-dNOPAUSE', '-dBATCH',
+        '-sOutputFile=' + new, old]
+    converter['pdf'] = make_external_conversion_command(cmd)
+    converter['eps'] = make_external_conversion_command(cmd)
 
 if matplotlib.checkdep_inkscape() is not None:
    cmd = lambda old, new: \

lib/matplotlib/testing/decorators.py

@@ -6,6 +6,7 @@
 import matplotlib
 import matplotlib.tests
 import matplotlib.units
+from matplotlib import cbook
 from matplotlib import ticker
 from matplotlib import pyplot as plt
 from matplotlib import ft2font
@@ -281,6 +282,6 @@ def find_dotted_module(module_name, path=None):
     result_dir = os.path.abspath(os.path.join('result_images', subdir))
 
     if not os.path.exists(result_dir):
-        os.makedirs(result_dir)
+        cbook.mkdirs(result_dir)
 
     return baseline_dir, result_dir