Revert "rpdb hack."

This reverts commit 71115f74.

Conflicts:
	slapos/resiliencytest/suites/erp5cluster.py
parent 6dab8ea3
...@@ -42,7 +42,7 @@ setup(name=name, ...@@ -42,7 +42,7 @@ setup(name=name,
'slapos.core', # as it provides library for slap 'slapos.core', # as it provides library for slap
'xml_marshaller', # needed to dump information 'xml_marshaller', # needed to dump information
'GitPython', #needed for git manipulation into slaprunner 'GitPython', #needed for git manipulation into slaprunner
'netifaces', 'rpdb' 'netifaces',
] + additional_install_requires, ] + additional_install_requires,
extras_require = { extras_require = {
'lampconfigure': ["mysql-python"], #needed for MySQL Database access 'lampconfigure': ["mysql-python"], #needed for MySQL Database access
......
...@@ -101,7 +101,6 @@ class ERP5ClusterTestSuite(ERP5TestSuite): ...@@ -101,7 +101,6 @@ class ERP5ClusterTestSuite(ERP5TestSuite):
data='project=workspace%2Fslapos&name=erp5-cluster&create=0' data='project=workspace%2Fslapos&name=erp5-cluster&create=0'
) )
def _connectToERP5(self, url, data=None, password=None): def _connectToERP5(self, url, data=None, password=None):
if password is None: if password is None:
password = self._getERP5Password() password = self._getERP5Password()
...@@ -111,23 +110,13 @@ class ERP5ClusterTestSuite(ERP5TestSuite): ...@@ -111,23 +110,13 @@ class ERP5ClusterTestSuite(ERP5TestSuite):
if password is None: if password is None:
password = self._getERP5Password() password = self._getERP5Password()
import rpdb
debugger = rpdb.Rpdb(port=12349)
debugger.set_trace()
return ERP5TestSuite._createRandomERP5Document(self, password) return ERP5TestSuite._createRandomERP5Document(self, password)
def _getCreatedERP5Document(self): def _getCreatedERP5Document(self):
""" Fetch and return content of ERP5 document created above.""" """ Fetch and return content of ERP5 document created above."""
import rpdb
debugger = rpdb.Rpdb(port=12348)
debugger.set_trace()
url = "%s/erp5/getTitle" % self._getERP5Url() url = "%s/erp5/getTitle" % self._getERP5Url()
return self._connectToERP5(url) return self._connectToERP5(url)
def runTestSuite(*args, **kwargs): def runTestSuite(*args, **kwargs):
""" """
Run ERP5 erp5-cluster Resiliency Test. Run ERP5 erp5-cluster Resiliency Test.
......
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