Change unittest2 back into unittest.

Django 1.7 docs pointed out unittest2 was backported into
python 2.7, so they dropped their version.

diff --git a/encode_submission/test_encode_find.py b/encode_submission/test_encode_find.py
index 77c758547f8c89ea33838936b9e6ec47b34f7ff5..a81f27a35058c6a6bb39e5fe21909af0c21d6f85 100644 (file)
--- a/encode_submission/test_encode_find.py
+++ b/encode_submission/test_encode_find.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from datetime import datetime
 import os
 #!/usr/bin/env python
 from datetime import datetime
 import os

-from unittest2 import TestCase
+from unittest import TestCase

 
 import RDF
 
 
 import RDF
 


@@ -162,12 +162,12 @@ _:bnode120970
                              '12097')
 
 def suite():
                              '12097')
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestEncodeFind))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestEncodeFind))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main()
     main()

diff --git a/encode_submission/test_ucsc_gather.py b/encode_submission/test_ucsc_gather.py
index 6063951db788a2e9f9562f9a113fae5e335cec7b..162f56ad4d6730b13cbb41915b723371828f7cf3 100644 (file)
--- a/encode_submission/test_ucsc_gather.py
+++ b/encode_submission/test_ucsc_gather.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase, TestSuite, defaultTestLoader
+from unittest import TestCase, TestSuite, defaultTestLoader

 
 import ucsc_gather
 
 
 import ucsc_gather
 


@@ -11,5 +11,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest='suite')
     main(defaultTest='suite')

diff --git a/htsworkflow/automation/test/test_runner.py b/htsworkflow/automation/test/test_runner.py
index a60c458401b2f0e8129c72d1a5864b0c11f045a5..22c5b19a68cfe04cdf7d667c9bc854601613de36 100644 (file)
--- a/htsworkflow/automation/test/test_runner.py
+++ b/htsworkflow/automation/test/test_runner.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase
+from unittest import TestCase

 
 import os
 from htsworkflow.automation.solexa import is_runfolder
 
 import os
 from htsworkflow.automation.solexa import is_runfolder


@@ -41,12 +41,12 @@ class testRunner(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testRunner))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testRunner))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/automation/test/test_solexa_utils.py b/htsworkflow/automation/test/test_solexa_utils.py
index 210906ecaf7b1cdf7aa3aeaeea008414dd0b4e14..2111406b474620a0457ccb86b6a18004e8ab131a 100644 (file)
--- a/htsworkflow/automation/test/test_solexa_utils.py
+++ b/htsworkflow/automation/test/test_solexa_utils.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.automation import solexa
 
 
 from htsworkflow.automation import solexa
 


@@ -24,12 +24,12 @@ class testSolexaRunfolderUtils(TestCase):
             
 
 def suite():
             
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testSolexaRunfolderUtils))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testSolexaRunfolderUtils))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/frontend/experiments/test_experiments.py b/htsworkflow/frontend/experiments/test_experiments.py
index fab24ccf36a5120b7b4229308aa2b4e037af5ae6..b7474d9349dff20029150703b67ec42e359ff777 100644 (file)
--- a/htsworkflow/frontend/experiments/test_experiments.py
+++ b/htsworkflow/frontend/experiments/test_experiments.py
@@ -678,7 +678,7 @@ class TestSequencer(TestCase):
         self.assertEqual(len(errmsgs), 0)
 
 def suite():
         self.assertEqual(len(errmsgs), 0)
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     for testcase in [ClusterStationTestCases,
                      SequencerTestCases,
     suite = TestSuite()
     for testcase in [ClusterStationTestCases,
                      SequencerTestCases,


@@ -690,5 +690,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/frontend/inventory/test_inventory.py b/htsworkflow/frontend/inventory/test_inventory.py
index 2456ff30a4d06da181ed85d2d59aa9b41b8b931d..e3937e175bb0338e2c78b6a0092454eef2c0c232 100644 (file)
--- a/htsworkflow/frontend/inventory/test_inventory.py
+++ b/htsworkflow/frontend/inventory/test_inventory.py
@@ -114,11 +114,11 @@ class InventoryTestCase(TestCase):
         return flowcells
 
 def suite():
         return flowcells
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(InventoryTestCase))
     return suite
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(InventoryTestCase))
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/frontend/labels/test_labels.py b/htsworkflow/frontend/labels/test_labels.py
index 29354b2b60ff3e14a9191d03f1909dd717e43e8e..ca3633bb6d2c73635640d8dca26ef16f3fc9999b 100644 (file)
--- a/htsworkflow/frontend/labels/test_labels.py
+++ b/htsworkflow/frontend/labels/test_labels.py
@@ -22,11 +22,11 @@ True
 """}
 
 def suite():
 """}
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(SimpleTest))
     return suite
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(SimpleTest))
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/frontend/samples/test_samples.py b/htsworkflow/frontend/samples/test_samples.py
index 594f2813e6519988b42abccf0c070a81c99c16f8..e700e0e7cee959a620388ecfeeeb42774407b729 100644 (file)
--- a/htsworkflow/frontend/samples/test_samples.py
+++ b/htsworkflow/frontend/samples/test_samples.py
@@ -333,7 +333,7 @@ def get_rdf_memory_model():
     return model
 
 def suite():
     return model
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(LibraryTestCase))
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(SampleWebTestCase))
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(LibraryTestCase))
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(SampleWebTestCase))


@@ -341,5 +341,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_alignment_free.py b/htsworkflow/pipelines/test/test_alignment_free.py
index 700000bdd1145f6dc516defe436d0b009b91af6a..ea6e2def0bb71cc2ff65d1a59f497b0a2e251c12 100644 (file)
--- a/htsworkflow/pipelines/test/test_alignment_free.py
+++ b/htsworkflow/pipelines/test/test_alignment_free.py
@@ -4,7 +4,7 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines.test.simulate_runfolder import TESTDATA_DIR
 
 
 from htsworkflow.pipelines.test.simulate_runfolder import TESTDATA_DIR
 


@@ -21,12 +21,12 @@ class AlignmentFreeRunfolderTests(TestCase):
         self.assertEqual(run.runfolder_name, '130508_SN787_0146_BC23KDACXX')
 
 def suite():
         self.assertEqual(run.runfolder_name, '130508_SN787_0146_BC23KDACXX')
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(AlignmentFreeRunfolderTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(AlignmentFreeRunfolderTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_eland.py b/htsworkflow/pipelines/test/test_eland.py
index 57ad62cfc2cd309f05c14cc12e23b1ee12727ab5..f6851883952332ab4005e06b6713bb011dc928ef 100644 (file)
--- a/htsworkflow/pipelines/test/test_eland.py
+++ b/htsworkflow/pipelines/test/test_eland.py
@@ -2,7 +2,7 @@
 """More direct synthetic test cases for the eland output file processing
 """
 from StringIO import StringIO
 """More direct synthetic test cases for the eland output file processing
 """
 from StringIO import StringIO

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines.eland import ELAND, ElandLane, ElandMatches, \
      SampleKey, MatchCodes, MappedReads
 
 from htsworkflow.pipelines.eland import ELAND, ElandLane, ElandMatches, \
      SampleKey, MatchCodes, MappedReads


@@ -276,7 +276,7 @@ class TestElandMatches(TestCase):
         self.assertEqual(len(em[key11112]), 2)
 
 def suite():
         self.assertEqual(len(em[key11112]), 2)
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(MatchCodeTests))
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestMappedReads))
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(MatchCodeTests))
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestMappedReads))


@@ -286,5 +286,5 @@ def suite():
 
 
 if __name__ == "__main__":
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_extract_results.py b/htsworkflow/pipelines/test/test_extract_results.py
index 7381d8c38908a41753b79a202daecb9d56df847f..29ab3fddd71d7f7af123fc882adec7657f8d8e54 100644 (file)
--- a/htsworkflow/pipelines/test/test_extract_results.py
+++ b/htsworkflow/pipelines/test/test_extract_results.py
@@ -6,7 +6,7 @@ import os
 import tempfile
 import shutil
 import sys
 import tempfile
 import shutil
 import sys

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines import ipar
 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines import ipar


@@ -81,13 +81,13 @@ class RunfolderExtractTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderExtractTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderExtractTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
 
     main(defaultTest="suite")
 

diff --git a/htsworkflow/pipelines/test/test_genome_mapper.py b/htsworkflow/pipelines/test/test_genome_mapper.py
index 1101305effd80ede9a09d4db99abe3566b31c8ca..d71755c90c7e639f24b83ad0683614379b04a263 100644 (file)
--- a/htsworkflow/pipelines/test/test_genome_mapper.py
+++ b/htsworkflow/pipelines/test/test_genome_mapper.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase
+from unittest import TestCase

 
 from StringIO import StringIO
 from htsworkflow.pipelines import genome_mapper
 
 from StringIO import StringIO
 from htsworkflow.pipelines import genome_mapper


@@ -27,12 +27,12 @@ class testGenomeMapper(TestCase):
         
         
 def suite():
         
         
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testGenomeMapper))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testGenomeMapper))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_genomemap.py b/htsworkflow/pipelines/test/test_genomemap.py
index 7195d0f044a0e29529dc9e903e9598b12d4ad040..7640910afd0ae6078a658237049ac89d75f62957 100644 (file)
--- a/htsworkflow/pipelines/test/test_genomemap.py
+++ b/htsworkflow/pipelines/test/test_genomemap.py
@@ -5,7 +5,7 @@ import os
 from StringIO import StringIO
 import shutil
 import tempfile
 from StringIO import StringIO
 import shutil
 import tempfile

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import ElementTree
 from htsworkflow.pipelines import genomemap
 
 from htsworkflow.pipelines import ElementTree
 from htsworkflow.pipelines import genomemap


@@ -77,12 +77,12 @@ class TestGenomeMap(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestGenomeMap))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestGenomeMap))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_run_xml.py b/htsworkflow/pipelines/test/test_run_xml.py
index 8b28b9e9cc88eb34d687865fc6ad5b78a1a4a19c..42dedf9be9ed160fc2c6308ce88e3036e98fd1f6 100644 (file)
--- a/htsworkflow/pipelines/test/test_run_xml.py
+++ b/htsworkflow/pipelines/test/test_run_xml.py
@@ -1,5 +1,5 @@
 import os
 import os

-from unittest2 import TestCase
+from unittest import TestCase

 from StringIO import StringIO
 
 from simulate_runfolder import TESTDATA_DIR
 from StringIO import StringIO
 
 from simulate_runfolder import TESTDATA_DIR


@@ -97,12 +97,12 @@ class testLoadRunXML(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testLoadRunXML))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testLoadRunXML))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder026.py b/htsworkflow/pipelines/test/test_runfolder026.py
index de68a2505cbb2e1e6f83726e23780008d6e90b83..fe52a62060fda3b50d815eaae35c0e3d4fb04d8e 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder026.py
+++ b/htsworkflow/pipelines/test/test_runfolder026.py
@@ -4,7 +4,7 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import firecrest
 from htsworkflow.pipelines import bustard
 
 from htsworkflow.pipelines import firecrest
 from htsworkflow.pipelines import bustard


@@ -471,12 +471,12 @@ class RunfolderTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder030.py b/htsworkflow/pipelines/test/test_runfolder030.py
index cd631bf6070a4f7c5bdd105ca56631462b364d70..323d7da2008abd8290054c2e74d0460c02cb00a7 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder030.py
+++ b/htsworkflow/pipelines/test/test_runfolder030.py
@@ -4,7 +4,7 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import firecrest
 from htsworkflow.pipelines import bustard
 
 from htsworkflow.pipelines import firecrest
 from htsworkflow.pipelines import bustard


@@ -895,11 +895,11 @@ class RunfolderTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder110.py b/htsworkflow/pipelines/test/test_runfolder110.py
index 27e66499684b0860b08925ff24558b7959aafeb5..bc2b3a60d3ff3d779d290c6a2b18a477ddbd35ce 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder110.py
+++ b/htsworkflow/pipelines/test/test_runfolder110.py
@@ -4,7 +4,7 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import firecrest
 from htsworkflow.pipelines import bustard
 
 from htsworkflow.pipelines import firecrest
 from htsworkflow.pipelines import bustard


@@ -300,12 +300,12 @@ class RunfolderTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder_casava_1_7.py b/htsworkflow/pipelines/test/test_runfolder_casava_1_7.py
index 96a5bcf1102a1a558c00ac93876cfb870cc50677..99364205c7f1412a38a1b60c0b292a8894bd753f 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_casava_1_7.py
+++ b/htsworkflow/pipelines/test/test_runfolder_casava_1_7.py
@@ -5,7 +5,7 @@ import glob
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import bustard
 from htsworkflow.pipelines import eland
 
 from htsworkflow.pipelines import bustard
 from htsworkflow.pipelines import eland


@@ -300,12 +300,12 @@ class RunfolderTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder_ipar100.py b/htsworkflow/pipelines/test/test_runfolder_ipar100.py
index 34a9c8a04e8ce85dfd97f4b46d77b02ee9256fd9..9de36535e2bd3cff21809570c794b525b719f62f 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_ipar100.py
+++ b/htsworkflow/pipelines/test/test_runfolder_ipar100.py
@@ -4,7 +4,7 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import ipar
 from htsworkflow.pipelines import bustard
 
 from htsworkflow.pipelines import ipar
 from htsworkflow.pipelines import bustard


@@ -299,12 +299,12 @@ class RunfolderTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder_ipar130.py b/htsworkflow/pipelines/test/test_runfolder_ipar130.py
index c23ed9730808416484500e37c866a29e984e9ce0..366f588b8b4472d5248a23ca777195ae656625d2 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_ipar130.py
+++ b/htsworkflow/pipelines/test/test_runfolder_ipar130.py
@@ -4,7 +4,7 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines import ipar
 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines import ipar


@@ -337,12 +337,12 @@ class RunfolderTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder_pair.py b/htsworkflow/pipelines/test/test_runfolder_pair.py
index dce07884228bdb154058af15e838a5926bca63d7..355765e6f26e852522d3895df85db61afd38ef6e 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_pair.py
+++ b/htsworkflow/pipelines/test/test_runfolder_pair.py
@@ -4,7 +4,7 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import firecrest
 from htsworkflow.pipelines import bustard
 
 from htsworkflow.pipelines import firecrest
 from htsworkflow.pipelines import bustard


@@ -325,12 +325,12 @@ class RunfolderTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder_rta.py b/htsworkflow/pipelines/test/test_runfolder_rta.py
index 497fe7b33181cd6896fb0cac05c0ce19d79c0b24..9c2a3d1ac88c7d28a30415a78cf643abc5ced9ed 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_rta.py
+++ b/htsworkflow/pipelines/test/test_runfolder_rta.py
@@ -4,7 +4,7 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines import ipar
 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines import ipar


@@ -299,12 +299,12 @@ class RunfolderTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder_rta160.py b/htsworkflow/pipelines/test/test_runfolder_rta160.py
index 8d8f2f104744672fc5ceba1ec3379f970dc093ac..19b0cfad384bf8edd96edf47ec2835f7f8eb2937 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_rta160.py
+++ b/htsworkflow/pipelines/test/test_runfolder_rta160.py
@@ -4,7 +4,7 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines import ipar
 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines import ipar


@@ -276,12 +276,12 @@ class RunfolderTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder_rta180.py b/htsworkflow/pipelines/test/test_runfolder_rta180.py
index 2817328dc3a0fdcc415cc17e0c1adda725bebc37..312d92fbbdf5e5b933fb6521ee497ae3445653fb 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_rta180.py
+++ b/htsworkflow/pipelines/test/test_runfolder_rta180.py
@@ -4,7 +4,7 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines import ipar
 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines import ipar


@@ -287,12 +287,12 @@ class RunfolderTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder_rta1_12.py b/htsworkflow/pipelines/test/test_runfolder_rta1_12.py
index 8396bd0351265fe940a4b75dff3c421345272f56..c22535b6bcbf7da056d621e92bc4b9bce1c750d1 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_rta1_12.py
+++ b/htsworkflow/pipelines/test/test_runfolder_rta1_12.py
@@ -5,7 +5,7 @@ import logging
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines.samplekey import SampleKey
 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines.samplekey import SampleKey


@@ -275,12 +275,12 @@ class RunfolderTests(TestCase):
         self.failIfEqual(r2.gerald, None)
 
 def suite():
         self.failIfEqual(r2.gerald, None)
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_runfolder_utils.py b/htsworkflow/pipelines/test/test_runfolder_utils.py
index e7c0c3807d950e18cdb854c86932c8247e4b45f1..5471c18f1b64b5ab45b5e7ddd37179a1970fd3b3 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_utils.py
+++ b/htsworkflow/pipelines/test/test_runfolder_utils.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase, TestSuite, defaultTestLoader
+from unittest import TestCase, TestSuite, defaultTestLoader

 
 from htsworkflow.pipelines import runfolder
 class TestRunfolderUtilities(TestCase):
 
 from htsworkflow.pipelines import runfolder
 class TestRunfolderUtilities(TestCase):


@@ -32,5 +32,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_samplekey.py b/htsworkflow/pipelines/test/test_samplekey.py
index ecd273dedd1c3eab53fc0c6b94b720ecadb5145f..7861a58763f3d764df43bd3942496fcf218b2e7f 100644 (file)
--- a/htsworkflow/pipelines/test/test_samplekey.py
+++ b/htsworkflow/pipelines/test/test_samplekey.py
@@ -2,7 +2,7 @@
 """More direct synthetic test cases for the eland output file processing
 """
 from StringIO import StringIO
 """More direct synthetic test cases for the eland output file processing
 """
 from StringIO import StringIO

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines.samplekey import SampleKey
 
 
 from htsworkflow.pipelines.samplekey import SampleKey
 


@@ -44,12 +44,12 @@ class TestSampleKey(TestCase):
         self.assertTrue(k3.matches(q3))
 
 def suite():
         self.assertTrue(k3.matches(q3))
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestSampleKey))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestSampleKey))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_sequences.py b/htsworkflow/pipelines/test/test_sequences.py
index 522a9aafdf1ff7f3364a99f70cbb530a622eeae8..cd2b852017e97fa48292cdd0ad5b3bbfebf29e5f 100644 (file)
--- a/htsworkflow/pipelines/test/test_sequences.py
+++ b/htsworkflow/pipelines/test/test_sequences.py
@@ -2,7 +2,7 @@
 import os
 import shutil
 import tempfile
 import os
 import shutil
 import tempfile

-from unittest2 import TestCase
+from unittest import TestCase

 
 import RDF
 
 
 import RDF
 


@@ -612,12 +612,12 @@ class SimulateSimpleTree(SimulateTree):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(SequenceFileTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(SequenceFileTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/pipelines/test/test_summary.py b/htsworkflow/pipelines/test/test_summary.py
index 1f7e46108856a737846c93996212a3d9cf80b69c..fbc025bd2aa79c8759bff1fcaaa93631856bdbf4 100644 (file)
--- a/htsworkflow/pipelines/test/test_summary.py
+++ b/htsworkflow/pipelines/test/test_summary.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import os
 from StringIO import StringIO
 #!/usr/bin/env python
 import os
 from StringIO import StringIO

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.pipelines import summary
 from simulate_runfolder import TESTDATA_DIR
 
 from htsworkflow.pipelines import summary
 from simulate_runfolder import TESTDATA_DIR


@@ -36,12 +36,12 @@ class SummaryTests(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(SummaryTests))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(SummaryTests))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/submission/test/test_condorfastq.py b/htsworkflow/submission/test/test_condorfastq.py
index 1e1c2d9bc56677cdef09b5b2efca48d296e5fdb3..2d232715e5289d93c17b68da92c7dfdac45f6b04 100644 (file)
--- a/htsworkflow/submission/test/test_condorfastq.py
+++ b/htsworkflow/submission/test/test_condorfastq.py
@@ -681,11 +681,11 @@ class TestCondorFastq(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestCondorFastq))
     return suite
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestCondorFastq))
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest='suite')
     main(defaultTest='suite')

diff --git a/htsworkflow/submission/test/test_daf.py b/htsworkflow/submission/test/test_daf.py
index 082c4ab5e5cb793e0d43c701d2cf1e9de08867eb..5bc9014267cfbbb2c1536e8c21ac83d3d7f57d23 100644 (file)
--- a/htsworkflow/submission/test/test_daf.py
+++ b/htsworkflow/submission/test/test_daf.py
@@ -4,7 +4,7 @@ import os
 from StringIO import StringIO
 import shutil
 import tempfile
 from StringIO import StringIO
 import shutil
 import tempfile

-from unittest2 import TestCase, TestSuite, defaultTestLoader
+from unittest import TestCase, TestSuite, defaultTestLoader

 
 from htsworkflow.submission import daf, results
 from htsworkflow.util.rdfhelp import \
 
 from htsworkflow.submission import daf, results
 from htsworkflow.util.rdfhelp import \


@@ -338,5 +338,5 @@ def suite():
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)

-    from unittest2 import main
+    from unittest import main

     main(defaultTest='suite')
     main(defaultTest='suite')

diff --git a/htsworkflow/submission/test/test_encoded.py b/htsworkflow/submission/test/test_encoded.py
index 31a551d0317be76a48fbc897005888fa34372fb9..a1b22a02feca20e6552c2fc7c40068868134b02d 100644 (file)
--- a/htsworkflow/submission/test/test_encoded.py
+++ b/htsworkflow/submission/test/test_encoded.py
@@ -1,7 +1,7 @@
 import json
 import os
 from pprint import pprint
 import json
 import os
 from pprint import pprint

-from unittest2 import TestCase, TestSuite, defaultTestLoader, skip
+from unittest import TestCase, TestSuite, defaultTestLoader, skip

 
 from htsworkflow.submission.encoded import (ENCODED,
      ENCODED_CONTEXT,
 
 from htsworkflow.submission.encoded import (ENCODED,
      ENCODED_CONTEXT,


@@ -185,5 +185,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest='suite')
     main(defaultTest='suite')

diff --git a/htsworkflow/submission/test/test_fastqname.py b/htsworkflow/submission/test/test_fastqname.py
index 56c094ea3fddb02538df63e730f0dbaf5f4deb39..c84599dbb534bf59ea684456c23472b9dac08a90 100644 (file)
--- a/htsworkflow/submission/test/test_fastqname.py
+++ b/htsworkflow/submission/test/test_fastqname.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase
+from unittest import TestCase

 from htsworkflow.submission.fastqname import FastqName
 
 class TestFastqName(TestCase):
 from htsworkflow.submission.fastqname import FastqName
 
 class TestFastqName(TestCase):


@@ -123,11 +123,11 @@ class TestFastqName(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestFastqName))
     return suite
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestFastqName))
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest='suite')
     main(defaultTest='suite')

diff --git a/htsworkflow/submission/test/test_results.py b/htsworkflow/submission/test/test_results.py
index ee207cf57d972cc48dbda9279fba6683f29ab0bb..08bb413ce49208dafde2e226e23e44f12554ba6f 100644 (file)
--- a/htsworkflow/submission/test/test_results.py
+++ b/htsworkflow/submission/test/test_results.py
@@ -3,7 +3,7 @@
 from pprint import pprint
 import shutil
 
 from pprint import pprint
 import shutil
 

-from unittest2 import TestCase, defaultTestLoader
+from unittest import TestCase, defaultTestLoader

 
 from htsworkflow.submission.results import ResultMap
 from submission_test_common import *
 
 from htsworkflow.submission.results import ResultMap
 from submission_test_common import *


@@ -91,5 +91,5 @@ def suite():
 if __name__ == "__main__":
     import logging
     logging.basicConfig(level=logging.DEBUG)
 if __name__ == "__main__":
     import logging
     logging.basicConfig(level=logging.DEBUG)

-    from unittest2 import main
+    from unittest import main

     main(defaultTest='suite')
     main(defaultTest='suite')

diff --git a/htsworkflow/submission/test/test_submission.py b/htsworkflow/submission/test/test_submission.py
index e441f2013ed5d1990e08c9aef107763a9311941e..0c4e0870399eb30dbc1702d5fa1912de2a3ab837 100644 (file)
--- a/htsworkflow/submission/test/test_submission.py
+++ b/htsworkflow/submission/test/test_submission.py
@@ -3,7 +3,7 @@ import os
 from StringIO import StringIO
 import shutil
 import tempfile
 from StringIO import StringIO
 import shutil
 import tempfile

-from unittest2 import TestCase, TestSuite, defaultTestLoader
+from unittest import TestCase, TestSuite, defaultTestLoader

 
 from htsworkflow.submission import daf, results
 from htsworkflow.util.rdfhelp import \
 
 from htsworkflow.submission import daf, results
 from htsworkflow.util.rdfhelp import \


@@ -170,5 +170,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest='suite')
     main(defaultTest='suite')

diff --git a/htsworkflow/submission/test/test_ucsc.py b/htsworkflow/submission/test/test_ucsc.py
index fad690e27f5ee638d315c593336dbd110a84fa96..b4cb2d8bef2a24be839c2d631392c2311e6cac98 100644 (file)
--- a/htsworkflow/submission/test/test_ucsc.py
+++ b/htsworkflow/submission/test/test_ucsc.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase, TestSuite, defaultTestLoader
+from unittest import TestCase, TestSuite, defaultTestLoader

 from StringIO import StringIO
 
 from htsworkflow.submission import ucsc
 from StringIO import StringIO
 
 from htsworkflow.submission import ucsc


@@ -26,5 +26,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest='suite')
     main(defaultTest='suite')

diff --git a/htsworkflow/util/test/test_alphanum.py b/htsworkflow/util/test/test_alphanum.py
index 29a53859a6bcb70699f0e028039759c15882540d..a47e682d977a2f9099ac876e55b3859961acd40b 100644 (file)
--- a/htsworkflow/util/test/test_alphanum.py
+++ b/htsworkflow/util/test/test_alphanum.py
@@ -1,6 +1,6 @@
 import copy
 import os
 import copy
 import os

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.util.alphanum import alphanum
 
 
 from htsworkflow.util.alphanum import alphanum
 


@@ -42,12 +42,12 @@ class testAlphanum(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testAlphanum))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testAlphanum))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/util/test/test_api.py b/htsworkflow/util/test/test_api.py
index dadd6afd198fa841c19f81a56f3f6249becbdd47..4d5045738e4df5d131250df368e13e7f9ddb6667 100644 (file)
--- a/htsworkflow/util/test/test_api.py
+++ b/htsworkflow/util/test/test_api.py
@@ -1,6 +1,6 @@
 import copy
 import os
 import copy
 import os

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.util import api
 
 
 from htsworkflow.util import api
 


@@ -14,12 +14,12 @@ class testApi(TestCase):
         self.failUnless(k1 != k2)
 
 def suite():
         self.failUnless(k1 != k2)
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestApi))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestApi))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/util/test/test_conversion.py b/htsworkflow/util/test/test_conversion.py
index 4919e56a4c4a6527e4af1c185403e0a6952946ca..6eb15896bc6ac42a1afdeda756995446d3d1c4e3 100644 (file)
--- a/htsworkflow/util/test/test_conversion.py
+++ b/htsworkflow/util/test/test_conversion.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.util import conversion
 
 
 from htsworkflow.util import conversion
 


@@ -15,12 +15,12 @@ class TestConversion(TestCase):
         self.failUnlessEqual(s.stop, 2)
 
 def suite():
         self.failUnlessEqual(s.stop, 2)
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestConversion))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestConversion))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/util/test/test_ethelp.py b/htsworkflow/util/test/test_ethelp.py
index 461a564ab8f8d325dbb41f0f908555bc0b5d036b..379dd9e1e525e45bc81e414a60d21b07694d9333 100644 (file)
--- a/htsworkflow/util/test/test_ethelp.py
+++ b/htsworkflow/util/test/test_ethelp.py
@@ -1,5 +1,5 @@
 import os
 import os

-from unittest2 import TestCase
+from unittest import TestCase

 
 try:
   from xml.etree import ElementTree
 
 try:
   from xml.etree import ElementTree


@@ -25,12 +25,12 @@ class testETHelper(TestCase):
         self.failUnless(flatten(self.foo_tree), 'asdf')
 
 def suite():
         self.failUnless(flatten(self.foo_tree), 'asdf')
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testETHelper))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testETHelper))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/util/test/test_makebed.py b/htsworkflow/util/test/test_makebed.py
index af815b6644236a5df8b0c34d76e32b2342c714f8..50d2c64a638f5f8b84bff93f0418090c3fc7094d 100644 (file)
--- a/htsworkflow/util/test/test_makebed.py
+++ b/htsworkflow/util/test/test_makebed.py
@@ -1,6 +1,6 @@
 import os
 from StringIO import StringIO
 import os
 from StringIO import StringIO

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.util import makebed
 
 
 from htsworkflow.util import makebed
 


@@ -47,12 +47,12 @@ class testMakeBed(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testMakeBed))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testMakeBed))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/util/test/test_queuecommands.py b/htsworkflow/util/test/test_queuecommands.py
index 5885f73515e4422f3acaa39723f57dc1564ab26a..e320819be3094a27e053a3a10e8e02bd4c533a77 100644 (file)
--- a/htsworkflow/util/test/test_queuecommands.py
+++ b/htsworkflow/util/test/test_queuecommands.py
@@ -1,7 +1,7 @@
 import os
 import logging
 import time
 import os
 import logging
 import time

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.util.queuecommands import QueueCommands
 
 
 from htsworkflow.util.queuecommands import QueueCommands
 


@@ -44,12 +44,12 @@ class testQueueCommands(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testQueueCommands))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testQueueCommands))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/util/test/test_rdfhelp.py b/htsworkflow/util/test/test_rdfhelp.py
index 2f141904f830183d309720b4629205a2c9bdf67d..9694c37e244658b274735603c8723fc9986f3e32 100644 (file)
--- a/htsworkflow/util/test/test_rdfhelp.py
+++ b/htsworkflow/util/test/test_rdfhelp.py
@@ -1,6 +1,6 @@
 import os
 import types
 import os
 import types

-from unittest2 import TestCase
+from unittest import TestCase

 
 from datetime import datetime
 
 
 from datetime import datetime
 


@@ -265,7 +265,7 @@ except ImportError, e:
     print "Unable to test rdfhelp"
 
 def suite():
     print "Unable to test rdfhelp"
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestRDFHelp))
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestRDFSchemas))
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestRDFHelp))
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestRDFSchemas))


@@ -273,5 +273,5 @@ def suite():
 
 
 if __name__ == "__main__":
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/util/test/test_rdfinfer.py b/htsworkflow/util/test/test_rdfinfer.py
index c6164fa6ec81334dbf91a6486edf9d81a0ef5e29..417218e022fffc097bd633b7206abc3293e4b537 100644 (file)
--- a/htsworkflow/util/test/test_rdfinfer.py
+++ b/htsworkflow/util/test/test_rdfinfer.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase
+from unittest import TestCase

 
 import RDF
 
 
 import RDF
 


@@ -229,12 +229,12 @@ class TestInfer(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestInfer))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestInfer))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/util/test/test_rdfjsonld.py b/htsworkflow/util/test/test_rdfjsonld.py
index 8e501ba5b330a659b00bfcd1aa76d4d2b991d99a..dd9ea3743fb76c617b086ea0f26cbbda4ab20823 100644 (file)
--- a/htsworkflow/util/test/test_rdfjsonld.py
+++ b/htsworkflow/util/test/test_rdfjsonld.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase, TestSuite, defaultTestLoader, skip
+from unittest import TestCase, TestSuite, defaultTestLoader, skip

 
 from htsworkflow.util.rdfjsonld import load_into_model, to_node, triple_to_statement
 from htsworkflow.util.rdfhelp import get_model
 
 from htsworkflow.util.rdfjsonld import load_into_model, to_node, triple_to_statement
 from htsworkflow.util.rdfhelp import get_model


@@ -52,5 +52,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest='suite')
     main(defaultTest='suite')

diff --git a/htsworkflow/util/test/test_ucsc.py b/htsworkflow/util/test/test_ucsc.py
index 2b2e9763cb69cc61f43a93ca39bd73e25afa36a3..35c738881a06a9300aff6dcfdab440785439d488 100644 (file)
--- a/htsworkflow/util/test/test_ucsc.py
+++ b/htsworkflow/util/test/test_ucsc.py
@@ -1,7 +1,7 @@
 """Test wrappers around ucsc file formats
 """
 import os
 """Test wrappers around ucsc file formats
 """
 import os

-from unittest2 import TestCase
+from unittest import TestCase

 from htsworkflow.util.test import TEST_DATA_DIR
 from htsworkflow.util.ucsc import bigWigInfo
 
 from htsworkflow.util.test import TEST_DATA_DIR
 from htsworkflow.util.ucsc import bigWigInfo
 

diff --git a/htsworkflow/util/test/test_url.py b/htsworkflow/util/test/test_url.py
index 979e1441a23a42cb471a8fff78b4c6c8830f99fa..0d2c3a07225dfa5d01e016087121c3fc8d7f6e0e 100644 (file)
--- a/htsworkflow/util/test/test_url.py
+++ b/htsworkflow/util/test/test_url.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.util.url import normalize_url, parse_ssh_url
 
 
 from htsworkflow.util.url import normalize_url, parse_ssh_url
 


@@ -36,11 +36,11 @@ class TestURLUtilities(TestCase):
         self.assertRaises(ValueError, parse_ssh_url, 'hello')
         
 def suite():
         self.assertRaises(ValueError, parse_ssh_url, 'hello')
         
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestURLUtilities))
     return suite
 
 if __name__ == '__main__':
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestURLUtilities))
     return suite
 
 if __name__ == '__main__':

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/util/test/test_validate.py b/htsworkflow/util/test/test_validate.py
index cc05f3c56641e645ccbabb8c5006f83c3b7168da..c906cd5592fdc689509fe8e67d6339c20091b668 100644 (file)
--- a/htsworkflow/util/test/test_validate.py
+++ b/htsworkflow/util/test/test_validate.py
@@ -1,6 +1,6 @@
 import os
 from StringIO import StringIO
 import os
 from StringIO import StringIO

-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.util import validate
 
 
 from htsworkflow.util import validate
 


@@ -47,12 +47,12 @@ class TestValidate(TestCase):
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testValidate))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testValidate))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/htsworkflow/util/test/test_version.py b/htsworkflow/util/test/test_version.py
index 212f124314d5e131ec794acb7842d4c9bff16198..f1e4db0ea0e9fd104a23ab5c827245e908a98e13 100644 (file)
--- a/htsworkflow/util/test/test_version.py
+++ b/htsworkflow/util/test/test_version.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase
+from unittest import TestCase

 
 from htsworkflow.util import version
 
 
 from htsworkflow.util import version
 


@@ -11,11 +11,11 @@ class TestVersion(TestCase):
         
 
 def suite():
         
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTest(defaultTestLoader.loadTestsFromTestCase(TestVersion))
     return suite
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTest(defaultTestLoader.loadTestsFromTestCase(TestVersion))
     return suite
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/test/test_copier.py b/test/test_copier.py
index a2dd5d7c0624b99858fd31612bbb5b647f379fc8..52bd8e2879dfe47e4bf444ead9924873728942ee 100644 (file)
--- a/test/test_copier.py
+++ b/test/test_copier.py
@@ -82,12 +82,12 @@ notify_users: user3@example.fake
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testCopier))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testCopier))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")

diff --git a/test/test_srf2fastq.py b/test/test_srf2fastq.py
index 9185fffde9d516d8651a5ade40723645ab82fa26..e06ec82ed31e197e464665d2a68e9c99bb53d3b5 100644 (file)
--- a/test/test_srf2fastq.py
+++ b/test/test_srf2fastq.py
@@ -1,7 +1,7 @@
 import os
 from StringIO import StringIO
 import sys
 import os
 from StringIO import StringIO
 import sys

-from unittest2 import TestCase
+from unittest import TestCase

 
 _module_path, _module_name = os.path.split(__file__)
 sys.path.append(os.path.join(_module_path, '..', 'scripts'))
 
 _module_path, _module_name = os.path.split(__file__)
 sys.path.append(os.path.join(_module_path, '..', 'scripts'))


@@ -137,12 +137,12 @@ IIIIB+++
 
 
 def suite():
 
 
 def suite():

-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader

     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testSrf2Fastq))
     return suite
 
 
 if __name__ == "__main__":
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testSrf2Fastq))
     return suite
 
 
 if __name__ == "__main__":

-    from unittest2 import main
+    from unittest import main

     main(defaultTest="suite")
     main(defaultTest="suite")