Support runTestSuite too.

slapos/recipe/erp5_test/__init__.py

@@ -61,44 +61,20 @@ class Recipe(GenericBaseRecipe):
           '--persistent_memcached_server_hostname=%s' % kumofs_parsed.hostname,
           '--persistent_memcached_server_port=%s' % kumofs_parsed.port,
       ])]))
+    path_list.append(self.createPythonScript(self.options['run-test-suite'],
+        __name__ + '.test.runUnitTest', [dict(
+        instance_home=testinstance,
+        prepend_path=self.options['prepend-path'],
+        openssl_binary=self.options['openssl-binary'],
+        test_ca_path=self.options['certificate-authority-path'],
+        call_list=[self.options['run-test-suite-binary'],
+          '--db_list', ','.join(mysql_connection_string_list),
+          '--conversion_server_hostname=%s' % cloudooo_parsed.hostname,
+          '--conversion_server_port=%s' % cloudooo_parsed.port,
+          '--volatile_memcached_server_hostname=%s' % memcached_parsed.hostname,
+          '--volatile_memcached_server_port=%s' % memcached_parsed.port,
+          '--persistent_memcached_server_hostname=%s' % kumofs_parsed.hostname,
+          '--persistent_memcached_server_port=%s' % kumofs_parsed.port,
+      ])]))
 
     return path_list
-
-#  def installTestSuiteRunner(self, ca_conf, mysql_conf, conversion_server_conf,
-#                        memcached_conf, kumo_conf):
-#    """Installs bin/runTestSuite executable to run all tests using
-#       bin/runUnitTest"""
-#    testinstance = self.createDataDirectory('test_suite_instance')
-#    # workaround wrong assumptions of ERP5Type.tests.runUnitTest about
-#    # directory existence
-#    unit_test = os.path.join(testinstance, 'unit_test')
-#    if not os.path.isdir(unit_test):
-#      os.mkdir(unit_test)
-#    mysql_connection_string_list = []
-#    for test_database, test_user, test_password in \
-#        mysql_conf['mysql_parallel_test_dict']:
-#      mysql_connection_string_list.append(
-#          '%s@%s:%s %s %s' % (test_database, mysql_conf['ip'],
-#                              mysql_conf['tcp_port'], test_user, test_password))
-#    command = zc.buildout.easy_install.scripts([
-#      ('runTestSuite', __name__ + '.test_suite_runner', 'runTestSuite')],
-#      self.ws, sys.executable, self.bin_directory, arguments=[dict(
-#        instance_home=testinstance,
-#        prepend_path=self.bin_directory,
-#        openssl_binary=self.options['openssl_binary'],
-#        test_ca_path=ca_conf['certificate_authority_path'],
-#        call_list=[self.options['runTestSuite_binary'],
-#          '--db_list', ','.join(mysql_connection_string_list),
-#          '--conversion_server_hostname=%(conversion_server_ip)s' % \
-#                                                         conversion_server_conf,
-#          '--conversion_server_port=%(conversion_server_port)s' % \
-#                                                         conversion_server_conf,
-#          '--volatile_memcached_server_hostname=%(memcached_ip)s' % memcached_conf,
-#          '--volatile_memcached_server_port=%(memcached_port)s' % memcached_conf,
-#          '--persistent_memcached_server_hostname=%(kumo_gateway_ip)s' % kumo_conf,
-#          '--persistent_memcached_server_port=%(kumo_gateway_port)s' % kumo_conf,
-#      ]
-#        )])[0]
-#    self.path_list.append(command)
-
-