Change unittest2 back into unittest.

[htsworkflow.git] / htsworkflow / automation / test / test_runner.py

diff --git a/htsworkflow/automation/test/test_runner.py b/htsworkflow/automation/test/test_runner.py
index 6c3b9df5491bd95abfe75d814f273951fb847ce7..22c5b19a68cfe04cdf7d667c9bc854601613de36 100644 (file)
--- a/htsworkflow/automation/test/test_runner.py
+++ b/htsworkflow/automation/test/test_runner.py
@@ -1,8 +1,7 @@
-import unittest
-
+from unittest import TestCase
 
 import os
-from htsworkflow.automation.copier import runfolder_validate
+from htsworkflow.automation.solexa import is_runfolder
 
 def extract_runfolder_path(watchdir, event):
   runfolder_path = watchdir
@@ -13,17 +12,18 @@ def extract_runfolder_path(watchdir, event):
   fragments = path[len(watchdir):].split(os.path.sep)
   for f in fragments:
     runfolder_path = os.path.join(runfolder_path, f)
-    if runfolder_validate(f):
+    if is_runfolder(f):
       return runfolder_path
   return None
 
+
 class Event(object):
   def __init__(self, path=None, name=None):
     self.path = path
     self.name = name
 
-class testRunner(unittest.TestCase):
 
+class testRunner(TestCase):
     def test_extract_runfolder(self):
         watchdir = os.path.join('root', 'server', 'mount')
         runfolder = os.path.join(watchdir, '080909_HWI-EAS229_0052_1234ABCD')
@@ -38,9 +38,15 @@ class testRunner(unittest.TestCase):
 
         event = Event( path=other)
         self.failUnlessEqual(extract_runfolder_path(watchdir, event), None )
-        
+
+
 def suite():
-    return unittest.makeSuite(testRunner,'test')
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(testRunner))
+    return suite
+
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="suite")
+    from unittest import main
+    main(defaultTest="suite")