Merge branch 'f-xlsimporter-error' into dev

src/caosadvancedtools/table_importer.py

@@ -182,7 +182,7 @@ class XLSImporter(object):
         """
         try:
             xls_file = pd.io.excel.ExcelFile(filename)
-        except XLRDError as e:
+        except (XLRDError, ValueError) as e:
             logger.warning(
                 "Cannot read \n{}.\nError:{}".format(filename,
                                                      str(e)),

unittests/test_table_importer.py

@@ -164,7 +164,6 @@ class XLSImporterTest(unittest.TestCase):
         df_new = self.importer.check_unique(df)
         self.assertEqual(df_new.shape[0], 1)
 
-    @pytest.mark.xfail(reason="Wrong Error is raised. See Issue #52")
     def test_raise(self):
         tmp = NamedTemporaryFile(delete=False, suffix=".lol")
         tmp.close()