projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change unittest2 back into unittest.
[htsworkflow.git]
/
htsworkflow
/
pipelines
/
test
/
test_eland.py
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 unittest
2
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 unittest
2
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 unittest
2
import main
+ from unittest import main
main(defaultTest="suite")
main(defaultTest="suite")