Change unittest2 back into unittest.

[htsworkflow.git] / test / test_copier.py

diff --git a/test/test_copier.py b/test/test_copier.py
index da4834010d17c18d06226fa9070ac6a3c8f295c6..52bd8e2879dfe47e4bf444ead9924873728942ee 100644 (file)
--- a/test/test_copier.py
+++ b/test/test_copier.py
@@ -1,30 +1,30 @@
-import unittest
+from unittest import TestCase, skipIf
 
 from StringIO import StringIO
-from htsworkflow.automation import copier
+from htsworkflow.automation.solexa import is_runfolder
 
-class testCopier(unittest.TestCase):
-    def test_runfolder_validate(self):
-        self.failUnlessEqual(copier.runfolder_validate(""), False)
-        self.failUnlessEqual(copier.runfolder_validate("1345_23"), False)
-        self.failUnlessEqual(copier.runfolder_validate("123456_asdf-$23'"), False)
-        self.failUnlessEqual(copier.runfolder_validate("123456_USI-EAS44"), True)
-        self.failUnlessEqual(copier.runfolder_validate("123456_USI-EAS44 "), False)
-        
+try:
+    from htsworkflow.automation import copier
+    BENDERJAB_UNAVAILABLE = False
+except ImportError as e:
+    BENDERJAB_UNAVAILABLE = True
+
+@skipIf(BENDERJAB_UNAVAILABLE, "Can't test copier daemon without a working benderjab")
+class testCopier(TestCase):
     def test_empty_config(self):
         cfg = StringIO("""[fake]
 something: unrelated
 """)
         bot = copier.CopierBot('fake', configfile=cfg)
         self.failUnlessRaises(RuntimeError, bot.read_config)
-        
+
     def test_full_config(self):
-        cfg = StringIO("""[copier]        
+        cfg = StringIO("""[copier]
 jid: copier@example.fake
 password: badpassword
 authorized_users: user1@example.fake user2@example.fake
 rsync_password_file: ~/.sequencer
-rsync_sources: rsync://localhost/tmp/sequencer_source
+rsync_sources: rsync://localhost/tmp/sequencer_source rsync://user@server:1234/other_sequencer
 rsync_destination: /tmp/sequencer_destination
 notify_users: user3@example.fake
 # who to run to
@@ -38,7 +38,7 @@ notify_users: user3@example.fake
         self.failUnlessEqual(len(c.authorized_users), 2)
         self.failUnlessEqual(c.authorized_users[0], 'user1@example.fake')
         self.failUnlessEqual(c.authorized_users[1], 'user2@example.fake')
-        self.failUnlessEqual(c.rsync.source_base_list[0], 
+        self.failUnlessEqual(c.rsync.source_base_list[0],
                              'rsync://localhost/tmp/sequencer_source/')
         self.failUnlessEqual(c.rsync.dest_base, '/tmp/sequencer_destination')
         self.failUnlessEqual(len(c.notify_users), 1)
@@ -46,17 +46,21 @@ notify_users: user3@example.fake
         self.failUnlessEqual(c.validate_url('rsync://other/tmp'), None)
         self.failUnlessEqual(c.validate_url('http://localhost/tmp'), None)
         # In the rsync process the URL gets a trailing '/' added to it
-        # But in the bot config its still slash-less. 
+        # But in the bot config its still slash-less.
         # It is debatable when to add the trailing slash.
         self.failUnlessEqual(
-          c.validate_url('rsync://localhost/tmp/sequencer_source'), 
-          'rsync://localhost/tmp/sequencer_source') 
+          c.validate_url('rsync://localhost/tmp/sequencer_source'),
+          'rsync://localhost/tmp/sequencer_source')
         self.failUnlessEqual(
-          c.validate_url('rsync://localhost/tmp/sequencer_source/'), 
+          c.validate_url('rsync://localhost/tmp/sequencer_source/'),
           'rsync://localhost/tmp/sequencer_source/')
         self.failUnlessEqual(
-          c.validate_url('rsync://localhost/tmp/sequencer_source/bleem'), 
+          c.validate_url('rsync://localhost/tmp/sequencer_source/bleem'),
           'rsync://localhost/tmp/sequencer_source/bleem')
+        self.failUnlessEqual(
+          c.validate_url('rsync://user@server:1234/other_sequencer'),
+          'rsync://user@server:1234/other_sequencer')
+
 
     def test_dirlist_filter(self):
        """
@@ -76,8 +80,14 @@ notify_users: user3@example.fake
        self.failUnlessEqual(len(result), 1)
        self.failUnlessEqual(result[0][-1], '4')
 
+
 def suite():
-    return unittest.makeSuite(testCopier,'test')
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(testCopier))
+    return suite
+
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="suite")
+    from unittest import main
+    main(defaultTest="suite")