Commit 45dc74d8 authored by Sebastien Robin's avatar Sebastien Robin

erp5testnode: fixed some broken logic and other improvements

- some variables were designed for a single test suite, so create
  NodeTestSuite objects to store them (some logic was broken after
  the split of the long run method into several methods)
- remove some optimization that were trying to reduce a bit the
  load on master. This was adding complexity for little benefit
- take into account new status code from slapos.core
parent df31be0a
......@@ -125,6 +125,8 @@ class SlapOSControler(object):
status_dict = self.spawn(config['slapgrid_software_binary'], '-v', '-c',
config['slapos_config'], raise_error_if_fail=False,
log_prefix='slapgrid_sr', get_output=False)
if status_dict['status_code'] == 0:
break
return status_dict
def runComputerPartition(self, config, environment,
......@@ -150,4 +152,8 @@ class SlapOSControler(object):
config['slapos_config'], raise_error_if_fail=False,
log_prefix='slapgrid_cp', get_output=False)
self.log('slapgrid_cp status_dict : %r' % (status_dict,))
# we can continue if status code is ok (0) or if we have just
# a promise failure (2)
if status_dict['status_code'] in (0, 2):
break
return status_dict
This diff is collapsed.
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