Attempt to be robust to not having an alignment in our RunXml file

[htsworkflow.git] / test / test_copier.py

diff --git a/test/test_copier.py b/test/test_copier.py
index da4834010d17c18d06226fa9070ac6a3c8f295c6..3e26cc679605f36d45d5f24016a99f959df63b4e 100644 (file)
--- a/test/test_copier.py
+++ b/test/test_copier.py
@@ -1,16 +1,10 @@
-import unittest
+from unittest2 import TestCase
 
 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)
-        
+class testCopier(TestCase):
     def test_empty_config(self):
         cfg = StringIO("""[fake]
 something: unrelated
@@ -24,7 +18,7 @@ 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
@@ -57,6 +51,10 @@ notify_users: user3@example.fake
         self.failUnlessEqual(
           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 +74,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 unittest2 import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(testCopier))
+    return suite
+
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="suite")
+    from unittest2 import main
+    main(defaultTest="suite")