Rebased master

Author: MarcCote

nibabel/testing/__init__.py

@@ -14,7 +14,6 @@
 import sys
 import warnings
 from os.path import dirname, abspath, join as pjoin
-from nibabel.externals.six.moves import zip_longest
 
 import numpy as np
 from numpy.testing import assert_array_equal
@@ -27,6 +26,8 @@
 except ImportError:
     pass
 
+from nibabel.externals.six.moves import zip_longest
+
 # set path to example data
 data_path = abspath(pjoin(dirname(__file__), '..', 'tests', 'data'))
 
@@ -64,6 +65,22 @@ def assert_allclose_safely(a, b, match_nans=True, rtol=1e-5, atol=1e-8):
     assert_true(np.allclose(a, b, rtol=rtol, atol=atol))
 
 
+def check_iteration(iterable):
+    """ Checks that an object can be iterated through without errors. """
+    try:
+        for _ in iterable:
+            pass
+    except:
+        return False
+
+    return True
+
+
+def assert_arrays_equal(arrays1, arrays2):
+    for arr1, arr2 in zip_longest(arrays1, arrays2, fillvalue=None):
+        assert_array_equal(arr1, arr2)
+
+
 def assert_re_in(regex, c, flags=0):
     """Assert that container (list, str, etc) contains entry matching the regex
     """
@@ -75,7 +92,6 @@ def assert_re_in(regex, c, flags=0):
     raise AssertionError("Not a single entry matched %r in %r" % (regex, c))
 
 
-
 def get_fresh_mod(mod_name=__name__):
     # Get this module, with warning registry empty
     my_mod = sys.modules[mod_name]
@@ -179,7 +195,17 @@ class suppress_warnings(error_warnings):
 
 
 class catch_warn_reset(clear_and_catch_warnings):
+
     def __init__(self, *args, **kwargs):
         warnings.warn('catch_warn_reset is deprecated and will be removed in '
                       'nibabel v3.0; use nibabel.testing.clear_and_catch_warnings.',
                       FutureWarning)
+
+
+EXTRA_SET = os.environ.get('NIPY_EXTRA_TESTS', '').split(',')
+
+
+def runif_extra_has(test_str):
+    """Decorator checks to see if NIPY_EXTRA_TESTS env var contains test_str"""
+    return skipif(test_str not in EXTRA_SET,
+                  "Skip {0} tests.".format(test_str))