TESTS improve coverage

Author: xgrg

.coveragerc

@@ -1,7 +1,5 @@
 [run]
 omit =
   ./setup.py
-  ./setupegg.py
-  ./sphinx_pypi_upload.py
   ./doc/*
-  /home/travis/virtualenv/*
+  ./tests/fetch_config.py

.gitlab-ci.yml

@@ -403,18 +403,18 @@ def plot_segment(config, experiment_id, savefig=None, slices=None,
         log.warning(msg)
         raw = True
 
+    options = ['aparc+aseg.mgz']
+    fn0 = '%s.hippoAmygLabels-T1.v21.%s.FSvoxelSpace.mgz'
+    for side in ['lh', 'rh']:
+        for each in ['CA', 'HBT', 'FS60']:
+            options.append(fn0 % (side, each))
     if resource_name == 'FREESURFER7_EXTRAS':
         options = ['hypothalamic_subunits_seg.v1.mgz',
                    'ThalamicNuclei.v12.T1.FSvoxelSpace.mgz',
                    'brainstemSsLabels.v12.FSvoxelSpace.mgz']
         if fn not in options:
             raise Exception('`fn` should be among %s' % options)
     elif resource_name.startswith('FREESURFER'):
-        options = ['aparc+aseg.mgz']
-        fn0 = '%s.hippoAmygLabels-T1.v21.%s.FSvoxelSpace.mgz'
-        for side in ['lh', 'rh']:
-            for each in ['CA', 'HBT', 'FS60']:
-                options.append(fn0 % (side, each))
         if fn not in options:
             raise Exception('`fn` should be among %s' % options)
 

nisnap/xnat.py

@@ -178,19 +178,13 @@ def test_xnat_freesurfer_009(self):
                           samebox=True, labels=[9, 17, 48, 53])
 
     def test_xnat_freesurfer7_extras_010(self):
-        from nisnap import xnat, snap
-        from nisnap.utils import aseg
-
-        filepaths = xnat.download_resources(config='.xnat.cfg',
-                                            experiment_id='BBRCDEV_E02823',
-                                            resource_name='FREESURFER7_EXTRAS',
-                                            destination='/tmp/')
-        aseg_fp = filepaths[-1]
-        aseg.__swap_fs__(aseg_fp)
-        try:
-            aseg.__preproc_aseg__(aseg_fp, filepaths[1])
-        except Exception:
-            pass
-        snap.plot_segment(aseg_fp, bg=filepaths[1], axes='x', opacity=70,
-                          rowsize=4, figsize=(15, 15), savefig='/tmp/test.png',
-                          animated=False, samebox=True)
+        from nisnap import xnat
+        xnat.plot_segment(config='.xnat.cfg',
+                          experiment_id='BBRCDEV_E02823',
+                          resource_name='FREESURFER7_EXTRAS',
+                          savefig='/tmp/test.png',
+                          fn='hypothalamic_subunits_seg.v1.mgz')
+        xnat.plot_segment(config='.xnat.cfg',
+                          experiment_id='BBRCDEV_E02823',
+                          resource_name='FREESURFER7',
+                          savefig='/tmp/test.png')