erp5_test: remove duplicated code

slapos/recipe/erp5_test/__init__.py

@@ -85,7 +85,7 @@ class Recipe(GenericBaseRecipe):
             mysql_connection_string_list),
           ] + common_list, **common_dict)]))
     path_list.append(self.createPythonScript(self.options['run-test-suite'],
-        __name__ + '.test.runUnitTest', [dict(
+        __name__ + '.test.runTestSuite', [dict(
         call_list=[self.options['run-test-suite-binary'],
           '--db_list', ','.join(mysql_connection_string_list),
           ] + common_list, **common_dict)]))

slapos/recipe/erp5_test/test.py

@@ -57,29 +57,4 @@ def runTestSuite(args):
   argument_list.append(env)
   os.execle(executable_filepath, *argument_list)
 
-def runUnitTest(args):
-  env = os.environ.copy()
-  d = args[0]
-  if 'openssl_binary' in d:
-    env['OPENSSL_BINARY'] = d['openssl_binary']
-  if 'test_ca_path' in d:
-    env['TEST_CA_PATH'] = d['test_ca_path']
-  if 'prepend_path' in d:
-    env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
-  if 'instance_home' in d:
-    env['INSTANCE_HOME'] = d['instance_home']
-    env['REAL_INSTANCE_HOME'] = d['instance_home']
-  # Deal with Shebang size limitation
-  executable_filepath = d['call_list'][0]
-  file_object = open(executable_filepath, 'r')
-  line = file_object.readline()
-  file_object.close()
-  argument_list = []
-  if line[:2] == '#!':
-    executable_filepath = line[2:].strip()
-    argument_list.append(executable_filepath)
-  argument_list.extend(d['call_list'])
-  argument_list.extend(sys.argv[1:])
-  argument_list.append(env)
-  os.execle(executable_filepath, *argument_list)
-
+runUnitTest = runTestSuite