Remove some assert-raises tests

Author: wmvanvliet

mne/inverse_sparse/tests/test_gamma_map.py

@@ -130,12 +130,6 @@ def test_gamma_map_vol_sphere():
                                     eeg=False, meg=True)
 
     alpha = 0.5
-    pytest.raises(ValueError, gamma_map, evoked, fwd, cov, alpha,
-                  loose=0, return_residual=False)
-
-    pytest.raises(ValueError, gamma_map, evoked, fwd, cov, alpha,
-                  loose=0.2, return_residual=False)
-
     stc = gamma_map(evoked, fwd, cov, alpha, tol=1e-4,
                     xyz_same_gamma=False, update_mode=2,
                     return_residual=False)

mne/inverse_sparse/tests/test_mxne_inverse.py

@@ -204,16 +204,8 @@ def test_mxne_vol_sphere():
     fwd = mne.make_forward_solution(info, trans=None, src=src,
                                     bem=sphere, eeg=False, meg=True)
 
-    alpha = 80.
-    pytest.raises(ValueError, mixed_norm, evoked, fwd, cov, alpha,
-                  loose=0.0, return_residual=False,
-                  maxit=3, tol=1e-8, active_set_size=10)
-
-    pytest.raises(ValueError, mixed_norm, evoked, fwd, cov, alpha,
-                  loose=0.2, return_residual=False,
-                  maxit=3, tol=1e-8, active_set_size=10)
-
     # irMxNE tests
+    alpha = 80.
     with catch_logging() as log:
         stc = mixed_norm(evoked_l21, fwd, cov, alpha,
                          n_mxne_iter=1, maxit=30, tol=1e-8,

mne/minimum_norm/inverse.py

@@ -1407,6 +1407,10 @@ def _prepare_forward(forward, info, noise_cov, fixed, loose, rank, pca,
             raise ValueError('Computing inverse solutions for volume source '
                              'spaces with fixed orientations is not '
                              'supported.')
+    if 'volume' in loose and any(v < 1 for v in loose.values()):
+        raise ValueError('Computing inverse solutions with restricted '
+                         'orientations (loose < 1) is not supported for '
+                         'volume source spaces.')
 
     # Deal with "depth"
     if exp is not None:
@@ -1437,7 +1441,7 @@ def _prepare_forward(forward, info, noise_cov, fixed, loose, rank, pca,
                 'Forward operator has fixed orientation and can only '
                 'be used to make a fixed-orientation inverse '
                 'operator.')
-        if loose.get('surface', 1.) < 1. and not forward['surf_ori']:
+        if any(v < 1 for v in loose.values()) and not forward['surf_ori']:
             logger.info('Converting forward solution to surface orientation')
             convert_forward_solution(
                 forward, surf_ori=True, use_cps=use_cps, copy=False)