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_samplekey.py
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 unittest
2
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 unittest
2
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 unittest
2
import main
+ from unittest import main
main(defaultTest="suite")
main(defaultTest="suite")