runTestSuite: propagate --log_directory to runUnitTest

Each runUnitTest will use a subdirectory in the log directory used by
runTestSuite.

product/ERP5Type/tests/ERP5TypeTestSuite.py

@@ -22,7 +22,13 @@ class ERP5TypeTestSuite(TestSuite):
     instance_home = self.instance and 'unit_test.%u' % self.instance \
                                    or 'unit_test'
     if self.instance:
-      args = ('--instance_home=' + instance_home, ) + args
+      instance_home = 'unit_test.%u' % self.instance
+      args = ('--instance_home', instance_home,) + args
+      if self.log_directory:
+        log_directory = os.path.join(self.log_directory, args[-1].replace(':', '_'))
+        os.mkdir(log_directory)
+        args = ('--log_directory', log_directory, ) + args
+
     if self.__dict__.has_key("bt5_path"):
       args = ("--bt5_path=%s" % self.bt5_path,) + args
     instance_number = self.instance or 1

product/ERP5Type/tests/runTestSuite.py

@@ -103,6 +103,7 @@ def main():
                       default=None)
   testnode_group.add_argument("--xvfb_bin", default=None)
   testnode_group.add_argument("--firefox_bin", default=None)
+  testnode_group.add_argument("--log_directory", default=None)
 
   args = parser.parse_args()
   if args.bt5_path is not None:
@@ -132,7 +133,8 @@ def main():
                     zserver_frontend_url_list=args.zserver_frontend_url_list,
                     bt5_path=args.bt5_path,
                     firefox_bin=args.firefox_bin,
-                    xvfb_bin=args.xvfb_bin)
+                    xvfb_bin=args.xvfb_bin,
+                    log_directory=args.log_directory)
   test_result = master.createTestResult(revision, suite.getTestList(),
     args.test_node_title, suite.allow_restart, test_suite_title,
     args.project_title)