FIX: Different

Author: larsoner

surfer/tests/test_viz.py

@@ -3,7 +3,6 @@
 import os.path as op
 from os.path import join as pjoin
 import sys
-import warnings
 
 import pytest
 from mayavi import mlab
@@ -17,8 +16,6 @@
 from surfer.utils import (requires_fsaverage, requires_imageio, requires_fs,
                           _get_extra)
 
-warnings.simplefilter('always')
-
 subject_id = 'fsaverage'
 std_args = [subject_id, 'lh', 'inflated']
 data_dir = pjoin(op.dirname(__file__), '..', '..', 'examples', 'example_data')
@@ -85,21 +82,12 @@ def test_image(tmpdir):
     brain = Brain(subject_id, 'both', surf=surf, size=100)
     brain.add_overlay(overlay_fname, hemi='lh', min=5, max=20, sign="pos")
     brain.save_imageset(tmp_name, ['med', 'lat'], 'jpg')
-    brain.close()
-    del brain
-
-    brain = Brain(*std_args, size=100)
-    for b in brain.brain_matrix.ravel():
-        assert b._f.scene is not None
     brain.save_image(tmp_name)
     brain.save_image(tmp_name, 'rgba', True)
     brain.screenshot()
-    if os.getenv('TRAVIS', '') != 'true':
-        # for some reason these fail on Travis sometimes
-        brain.save_montage(tmp_name, ['l', 'v', 'm'], orientation='v')
-        brain.save_montage(tmp_name, ['l', 'v', 'm'], orientation='h')
-        brain.save_montage(tmp_name, [['l', 'v'], ['m', 'f']])
-    brain.close()
+    brain.save_montage(tmp_name, ['l', 'v', 'm'], orientation='v')
+    brain.save_montage(tmp_name, ['l', 'v', 'm'], orientation='h')
+    brain.save_montage(tmp_name, [['l', 'v'], ['m', 'f']])
 
 
 @requires_fsaverage()
@@ -108,8 +96,7 @@ def test_brains():
     # testing backend breaks when passing in a figure, so we use 'auto' here
     # (shouldn't affect usability, but it makes testing more annoying)
     _set_backend('auto')
-    with warnings.catch_warnings(record=True):  # traits for mlab.figure()
-        mlab.figure(101)
+    mlab.figure(101)
     surfs = ['inflated', 'white', 'white', 'white', 'white', 'white', 'white']
     hemis = ['lh', 'rh', 'both', 'both', 'rh', 'both', 'both']
     titles = [None, 'Hello', 'Good bye!', 'lut test',
@@ -122,8 +109,7 @@ def test_brains():
                    (0.2, 0.2, 0.2), "black", "0.75"]
     foregrounds = ["black", "white", "0.75", "red",
                    (0.2, 0.2, 0.2), "blue", "black"]
-    with warnings.catch_warnings(record=True):  # traits for mlab.figure()
-        figs = [101, mlab.figure(), None, None, mlab.figure(), None, None]
+    figs = [101, mlab.figure(), None, None, mlab.figure(), None, None]
     subj_dir = utils._get_subjects_dir()
     subj_dirs = [None, subj_dir, subj_dir, subj_dir,
                  subj_dir, subj_dir, subj_dir]
@@ -153,7 +139,6 @@ def test_annot():
     annots = ['aparc', 'aparc.a2005s']
     borders = [True, False, 2]
     alphas = [1, 0.5]
-    gc.collect()
     brain = Brain(*std_args)
     view = get_view(brain)
 
@@ -463,9 +448,8 @@ def test_probabilistic_labels():
     prob_field[ids] = probs
     brain.add_data(prob_field, thresh=1e-5)
 
-    with warnings.catch_warnings(record=True):
-        brain.data["colorbar"].number_of_colors = 10
-        brain.data["colorbar"].number_of_labels = 11
+    brain.data["colorbar"].number_of_colors = 10
+    brain.data["colorbar"].number_of_labels = 11
     brain.close()
 
 

surfer/viz.py

@@ -1,5 +1,4 @@
 from copy import deepcopy
-import gc
 import logging
 from math import floor
 import os
@@ -2291,9 +2290,6 @@ def hide_colorbar(self, row=-1, col=-1):
 
     def close(self):
         """Close all figures and cleanup data structure."""
-        self._close()
-
-    def _close(self, force_render=True):
         for ri, ff in enumerate(self._figures):
             for ci, f in enumerate(ff):
                 if f is not None:
@@ -2303,8 +2299,7 @@ def _close(self, force_render=True):
                         pass
                     self._figures[ri][ci] = None
 
-        if force_render:
-            _force_render([])
+        _force_render([])
 
         # should we tear down other variables?
         if getattr(self, '_v', None) is not None:
@@ -2313,10 +2308,9 @@ def _close(self, force_render=True):
             except Exception:
                 pass
             self._v = None
-        gc.collect()
 
     def __del__(self):
-        self._close(force_render=False)
+        self.close()
 
     ###########################################################################
     # SAVING OUTPUT