Re-enable some skipped tests.

Author: knirirr

tests/convert/test_isatab2sra.py

@@ -114,7 +114,6 @@ def test_isatab2sra_dump_submission_xml_biis7(self):
             actual_submission_xml_biis7 = etree.fromstring(submission_xml)
             self.assertTrue(utils.assert_xml_equal(self._expected_submission_xml_biis7, actual_submission_xml_biis7))
 
-    @unittest.skip("Not working yet")
     def test_isatab2sra_dump_project_set_xml_biis7(self):
         isatab2sra.convert(self._biis7_dir, self._tmp_dir, validate_first=False)
         with open(os.path.join(self._tmp_dir, "project_set.xml"), "rb") as ps_fp:

tests/convert/test_sampletab2isatab.py

@@ -6,8 +6,6 @@
 from isatools.convert import sampletab2isatab
 from isatools.tests import utils
 
-SLOW_TESTS = int(os.getenv("SLOW_TESTS", "0"))
-
 
 def setUpModule():
     if not os.path.exists(utils.DATA_DIR):
@@ -35,17 +33,16 @@ def test_sampletab2isatab_test_2(self):
         with open(os.path.join(self._sampletab_dir, "test2.txt")) as sampletab_fp:
             sampletab2isatab.convert(source_sampletab_fp=sampletab_fp, target_dir=self._tmp_dir)
 
-    @unittest.skipIf(not SLOW_TESTS, "slow")
+    @unittest.skip("deprecated method pending deletion")
     def test_sampletab2isatab_GSB_3(self):
         with open(os.path.join(self._sampletab_dir, "GSB-3.txt")) as sampletab_fp:
             sampletab2isatab.convert(source_sampletab_fp=sampletab_fp, target_dir=self._tmp_dir)
 
-    @unittest.skipIf(not SLOW_TESTS, "slow")
+    @unittest.skip("deprecated method pending deletion")
     def test_sampletab2isatab_GSB_537(self):
         with open(os.path.join(self._sampletab_dir, "GSB-537.txt")) as sampletab_fp:
             sampletab2isatab.convert(source_sampletab_fp=sampletab_fp, target_dir=self._tmp_dir)
 
-    @unittest.skip("slow")
     def test_sampletab2isatab_GSB_718(self):
         with open(os.path.join(self._sampletab_dir, "GSB-718.txt")) as sampletab_fp:
             sampletab2isatab.convert(source_sampletab_fp=sampletab_fp, target_dir=self._tmp_dir)