FIX: Various fixes

.travis.yml

@@ -72,7 +72,7 @@ install:
           export FREESURFER_HOME=$(python -c 'import mne; print(mne.datasets.testing.data_path())');
         fi;
       else
-        export MNE_SKIP_TESTING_DATASET_TESTS=true
+        export MNE_SKIP_TESTING_DATASET_TESTS=true;
       fi;
     - MNE_DIR=$(python -c 'import mne;print(mne.__path__[0])')
     # We run two versions: one out of the source directory (that makes
@@ -93,7 +93,13 @@ install:
       fi;
 
 script:
-    - nosetests --with-timer --timer-top-n 30 --verbosity=2;
+    # Ensure the "nodata" test does not access the internet
+    # (necessary to have MNE_SKIP_NETWORK_TESTS=1 above)
+    - if [ "${DEPS}" == "nodata" ]; then
+        sudo unshare -n -- nosetests --with-timer --timer-top-n 30 --verbosity=2;
+      else
+        nosetests --with-timer --timer-top-n 30 --verbosity=2;
+      fi;
 
 after_success:
     # Need to run from source dir to exectue "git" commands

Makefile

@@ -46,6 +46,9 @@ test: in
 	rm -f .coverage
 	$(NOSETESTS) mne
 
+test-no-network: in
+	sudo unshare -n -- sh -c 'MNE_SKIP_NETWORK_TESTS=1 nosetests mne'
+
 test-no-testing-data: in
 	@MNE_SKIP_TESTING_DATASET_TESTS=true \
 	$(NOSETESTS) mne

mne/beamformer/tests/test_dics.py

@@ -101,7 +101,7 @@ def test_dics():
     max_stc = stc.data[idx]
     tmax = stc.times[np.argmax(max_stc)]
 
-    # Odd due to limited number of epochs
+    # Incorrect due to limited number of epochs
     assert_true(0.04 < tmax < 0.05)
     assert_true(10 < np.max(max_stc) < 13)
 
@@ -153,7 +153,7 @@ def test_dics():
     max_stc = stc_avg[idx]
     tmax = stc.times[np.argmax(max_stc)]
 
-    assert_true(0.045 < tmax < 0.06)  # odd due to limited number of epochs
+    assert_true(0.045 < tmax < 0.06)  # incorrect due to limited # of epochs
     assert_true(12 < np.max(max_stc) < 18.5)
 
 

mne/tests/test_utils.py

@@ -286,13 +286,6 @@ def test_fetch_file():
     """Test file downloading
     """
     tempdir = _TempDir()
-    # Skipping test if no internet connection available
-    try:
-        urllib.request.urlopen("http://github.com", timeout=2)
-    except:
-        from nose.plugins.skip import SkipTest
-        raise SkipTest('No internet connection, skipping download test.')
-
     urls = ['http://www.google.com',
             'ftp://surfer.nmr.mgh.harvard.edu/pub/data/bert.recon.md5sum.txt']
     for url in urls:

mne/utils.py

@@ -21,7 +21,6 @@
 import tempfile
 import shutil
 from shutil import rmtree
-import atexit
 from math import log, ceil
 import json
 import ftplib