test always MEP27

OceanWolf · OceanWolf · commit 1d2095bc9123 · 2016-08-04T02:03:34.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -148,6 +148,8 @@ script:
   # 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).
+
+  # Load in the new toolbar rc file for tests
   - |
     if [[ $USENEWTOOLMANAGER == true ]]; then
       cp .travis/toolmgr_matplotlibrc matplotlibrc
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -812,7 +812,6 @@ def matplotlib_fname():
         cwd = os.getcwd()
     fname = os.path.join(cwd, 'matplotlibrc')
     if os.path.exists(fname):
-        print('found mplrc file in cwd')
         return fname
 
     if 'MATPLOTLIBRC' in os.environ:
diff --git a/lib/matplotlib/testing/__init__.py b/lib/matplotlib/testing/__init__.py
@@ -101,6 +101,10 @@ def setup():
     # These settings *must* be hardcoded for running the comparison
     # tests and are not necessarily the default values as specified in
     # rcsetup.py
+    use_new_toolmanager = rcParams['toolbar'] == 'toolmanager'
     rcdefaults()  # Start with all defaults
 
     set_font_settings_for_testing()
+
+    if use_new_toolmanager:
+        rcParams['toolbar'] = 'toolmanager'
