Fix tests.

Author: samuelgarcia

neo/test/iotest/test_klustakwikio.py

@@ -15,10 +15,9 @@
 import neo
 from neo.test.iotest.common_io_test import BaseTestIO
 from neo.test.tools import assert_arrays_almost_equal
-from neo.io.klustakwikio import KlustaKwikIO, HAVE_MLAB
+from neo.io.klustakwikio import KlustaKwikIO
 
 
-@unittest.skipUnless(HAVE_MLAB, "requires matplotlib")
 class testFilenameParser(unittest.TestCase):
     """Tests that filenames can be loaded with or without basename.
 
@@ -75,7 +74,6 @@ def test3(self):
                                                       'basename2.clu.1')))
 
 
-@unittest.skipUnless(HAVE_MLAB, "requires matplotlib")
 class testRead(unittest.TestCase):
     """Tests that data can be read from KlustaKwik files"""
 
@@ -140,7 +138,6 @@ def test2(self):
                                                                      0.228])))
 
 
-@unittest.skipUnless(HAVE_MLAB, "requires matplotlib")
 class testWrite(unittest.TestCase):
     def setUp(self):
         self.dirname = os.path.join(tempfile.gettempdir(),
@@ -249,7 +246,6 @@ def test1(self):
         delete_test_session()
 
 
-@unittest.skipUnless(HAVE_MLAB, "requires matplotlib")
 class testWriteWithFeatures(unittest.TestCase):
     def setUp(self):
         self.dirname = os.path.join(tempfile.gettempdir(),
@@ -333,7 +329,6 @@ def test1(self):
         delete_test_session(self.dirname)
 
 
-@unittest.skipUnless(HAVE_MLAB, "requires matplotlib")
 class CommonTests(BaseTestIO, unittest.TestCase):
     ioclass = KlustaKwikIO
     entities_to_download = [

neo/test/iotest/test_kwikio.py

@@ -5,17 +5,16 @@
 import unittest
 
 try:
-    import h5py
-
-    HAVE_H5PY = True
+    from klusta import kwik
+    HAVE_KWIK = True
 except ImportError:
-    HAVE_H5PY = False
+    HAVE_KWIK = False
+
 from neo.io import kwikio
 from neo.test.iotest.common_io_test import BaseTestIO
 
 
-@unittest.skipUnless(HAVE_H5PY, "requires h5py")
-@unittest.skipUnless(kwikio.HAVE_KWIK, "requires klusta")
+@unittest.skipUnless(   HAVE_KWIK, "requires klusta")
 class TestKwikIO(BaseTestIO, unittest.TestCase):
     ioclass = kwikio.KwikIO
     entities_to_download = [

neo/test/iotest/test_neomatlabio.py

@@ -10,7 +10,13 @@
 from neo.core.irregularlysampledsignal import IrregularlySampledSignal
 from neo import Block, Segment, SpikeTrain
 from neo.test.iotest.common_io_test import BaseTestIO
-from neo.io.neomatlabio import NeoMatlabIO, HAVE_SCIPY
+from neo.io.neomatlabio import NeoMatlabIO
+
+try:
+    import scipy.io
+    HAVE_SCIPY = True
+except:
+    HAVE_SCIPY = False
 
 
 @unittest.skipUnless(HAVE_SCIPY, "requires scipy")