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
/
submission
/
test
/
test_condorfastq.py
diff --git
a/htsworkflow/submission/test/test_condorfastq.py
b/htsworkflow/submission/test/test_condorfastq.py
index 09d68083c1ec50052c450a71e9d9e24356573cf7..2d232715e5289d93c17b68da92c7dfdac45f6b04 100644
(file)
--- a/
htsworkflow/submission/test/test_condorfastq.py
+++ b/
htsworkflow/submission/test/test_condorfastq.py
@@
-680,22
+680,12
@@
class TestCondorFastq(TestCase):
self.assertTrue('12345_C02F9ACXX_c202_l3_r2.fastq' in arguments[3])
self.assertTrue('12345_C02F9ACXX_c202_l3_r2.fastq' in arguments[3])
-OLD_DB = settings.DATABASES['default']['NAME']
-def setUpModule():
- setup_test_environment()
- connection.creation.create_test_db()
-
-def tearDownModule():
- connection.creation.destroy_test_db(OLD_DB)
- teardown_test_environment()
-
-
def suite():
def suite():
- from unittest
2
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 unittest
2
import main
+ from unittest import main
main(defaultTest='suite')
main(defaultTest='suite')