Commit bd90b868 authored by Romain Courteaud's avatar Romain Courteaud

No need to run 2 cloudooo in the same partitions.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44053 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent edf20b3e
...@@ -72,8 +72,6 @@ CONFIG = dict( ...@@ -72,8 +72,6 @@ CONFIG = dict(
# Conversion Server # Conversion Server
conversion_server_port=23000, conversion_server_port=23000,
conversion_server_ooo_port=23060, conversion_server_ooo_port=23060,
test_conversion_server_port=24000,
test_conversion_server_ooo_port=24060,
) )
...@@ -107,7 +105,6 @@ class Recipe(BaseSlapRecipe): ...@@ -107,7 +105,6 @@ class Recipe(BaseSlapRecipe):
self.parameter_dict.setdefault(k, v) self.parameter_dict.setdefault(k, v)
self.installMemcached() self.installMemcached()
self.installKumo() self.installKumo()
self.installTestConversionServer()
self.installConversionServer() self.installConversionServer()
self.installTestCertificateAuthority() self.installTestCertificateAuthority()
self.installCertificateAuthority() self.installCertificateAuthority()
...@@ -225,8 +222,8 @@ class Recipe(BaseSlapRecipe): ...@@ -225,8 +222,8 @@ class Recipe(BaseSlapRecipe):
'--erp5_sql_connection_string', '%(mysql_test_database)s@%' '--erp5_sql_connection_string', '%(mysql_test_database)s@%'
'(mysql_ip)s:%(mysql_port)s %(mysql_test_user)s ' '(mysql_ip)s:%(mysql_port)s %(mysql_test_user)s '
'%(mysql_test_password)s' % self.connection_dict, '%(mysql_test_password)s' % self.connection_dict,
'--conversion_server_hostname=%(test_conversion_server_ip)s' % self.connection_dict, '--conversion_server_hostname=%(conversion_server_ip)s' % self.connection_dict,
'--conversion_server_port=%(test_conversion_server_port)s' % self.connection_dict '--conversion_server_port=%(conversion_server_port)s' % self.connection_dict
] ]
)])[0] )])[0]
self.path_list.append(runUnitTest) self.path_list.append(runUnitTest)
...@@ -327,9 +324,6 @@ class Recipe(BaseSlapRecipe): ...@@ -327,9 +324,6 @@ class Recipe(BaseSlapRecipe):
def installConversionServer(self): def installConversionServer(self):
self._installConversionServer() self._installConversionServer()
def installTestConversionServer(self):
self._installConversionServer('test_')
def installCertificateAuthority(self): def installCertificateAuthority(self):
self._installCertificateAuthority() self._installCertificateAuthority()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment