Commit 63a514f8 authored by Hardik Juneja's avatar Hardik Juneja Committed by Rafael Monnerat

ResiliencyTests: Use "==" for numeric comparision instead of "is"

/reviewed-on nexedi/slapos.toolbox!25
parent beb86eab
...@@ -112,20 +112,20 @@ class SlaprunnerTestSuite(ResiliencyTestSuite): ...@@ -112,20 +112,20 @@ class SlaprunnerTestSuite(ResiliencyTestSuite):
) )
try: try:
json_data = json.loads(data) json_data = json.loads(data)
if json_data['code'] is 0: if json_data['code'] == 0:
raise IOError(data['result']) raise IOError(json_data['result'])
data = json_data['result'] data = json_data['result']
self.logger.info('Retrieved data are:\n%s' % data) self.logger.info('Retrieved data are:\n%s' % data)
except (ValueError, KeyError): except (ValueError, KeyError):
if data.find('<') is not -1: if data.find('<') != -1:
raise IOError( raise IOError(
'Could not retrieve logfile content: retrieved content is html.' 'Could not retrieve logfile content: retrieved content is html.'
) )
if data.find('Could not load') is not -1: if data.find('Could not load') != -1:
raise IOError( raise IOError(
'Could not retrieve logfile content: server could not load the file.' 'Could not retrieve logfile content: server could not load the file.'
) )
if data.find('Hello') is -1: if data.find('Hello') == -1:
raise IOError( raise IOError(
'Could not retrieve logfile content: retrieve content does not match "Hello".' 'Could not retrieve logfile content: retrieve content does not match "Hello".'
) )
...@@ -207,13 +207,13 @@ class SlaprunnerTestSuite(ResiliencyTestSuite): ...@@ -207,13 +207,13 @@ class SlaprunnerTestSuite(ResiliencyTestSuite):
data='repo=https://lab.nexedi.com/nexedi/slapos.git&name=workspace/slapos&email=slapos@slapos.org&user=slapos' data='repo=https://lab.nexedi.com/nexedi/slapos.git&name=workspace/slapos&email=slapos@slapos.org&user=slapos'
) )
data = json.loads(data) data = json.loads(data)
if data['code'] is 0: if data['code'] == 0:
self.logger.warning(data['result']) self.logger.warning(data['result'])
except (NotHttpOkException, urllib2.HTTPError): except (NotHttpOkException, urllib2.HTTPError):
# cloning can be very long. # cloning can be very long.
# XXX: quite dirty way to check. # XXX: quite dirty way to check.
while self._connectToSlaprunner('getProjectStatus', data='project=workspace/slapos').find('On branch master') is -1: while self._connectToSlaprunner('getProjectStatus', data='project=workspace/slapos').find('On branch master') == -1:
self.logger.info('git-cloning ongoing, sleeping...') self.logger.info('git-cloning ongoing, sleeping...')
def _openSoftwareRelease(self, software_release='erp5testnode/testsuite/dummy'): def _openSoftwareRelease(self, software_release='erp5testnode/testsuite/dummy'):
...@@ -222,7 +222,7 @@ class SlaprunnerTestSuite(ResiliencyTestSuite): ...@@ -222,7 +222,7 @@ class SlaprunnerTestSuite(ResiliencyTestSuite):
resource='setCurrentProject', resource='setCurrentProject',
data='path=workspace/slapos/software/%s/' % software_release data='path=workspace/slapos/software/%s/' % software_release
) )
if json.loads(data)['code'] is 0: if json.loads(data)['code'] == 0:
self.logger.warning(data['result']) self.logger.warning(data['result'])
raise IOError(data['result']) raise IOError(data['result'])
......
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