Change unittest2 back into unittest.

[htsworkflow.git] / htsworkflow / util / test / test_queuecommands.py

diff --git a/htsworkflow/util/test/test_queuecommands.py b/htsworkflow/util/test/test_queuecommands.py
index f4807d7efe03e85e49310ccd3dc7f3b7fee2e602..e320819be3094a27e053a3a10e8e02bd4c533a77 100644 (file)
--- a/htsworkflow/util/test/test_queuecommands.py
+++ b/htsworkflow/util/test/test_queuecommands.py
@@ -1,18 +1,15 @@
 import os
 import logging
 import time
-import unittest
-
+from unittest import TestCase
 
 from htsworkflow.util.queuecommands import QueueCommands
 
-class testQueueCommands(unittest.TestCase):
+class testQueueCommands(TestCase):
     def setUp(self):
         logging.basicConfig(level=logging.DEBUG,
                             format='%(asctime)s %(name)-8s %(message)s')
 
-       
-
     def test_unlimited_run_slow(self):
         """
         Run everything at once
@@ -21,14 +18,13 @@ class testQueueCommands(unittest.TestCase):
                 '/bin/sleep 1',
                 '/bin/sleep 2',]
 
-        q = QueueCommands(cmds)
+        q = QueueCommands(cmds, 3)
         start = time.time()
         q.run()
         end = time.time()-start
         # we should only take the length of the longest sleep
-        # pity I had to add a 1 second sleep
-        self.failUnless( end > 2.9 and end < 3.1,
-                         "took %s seconds, exected ~3" % (end,))
+        self.failUnless( end > 1.9 and end < 2.1,
+                         "took %s seconds, exected ~2" % (end,))
 
     def test_limited_run_slow(self):
         """
@@ -43,16 +39,17 @@ class testQueueCommands(unittest.TestCase):
         start = time.time()
         q.run()
         end = time.time()-start
-        # pity I had to add a 1 second sleep
-        self.failUnless( end > 5.9 and end < 6.1,
-                         "took %s seconds, expected ~6" % (end,)) 
-
-def suite():
-    return unittest.makeSuite(testQueueCommands, 'test')
-
-if __name__ == "__main__":
-    unittest.main(defaultTest='suite')
+        self.failUnless( end > 3.9 and end < 4.1,
+                         "took %s seconds, expected ~4" % (end,))
 
 
+def suite():
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(testQueueCommands))
+    return suite
 
 
+if __name__ == "__main__":
+    from unittest import main
+    main(defaultTest="suite")