etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

string checks in the nose plugin

This commit is contained in:
Daan Hoogland 2021-02-04 14:45:05 +00:00
parent dcd4e3612f
commit cfabfd5b7e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/marvin/marvin/cloudstackTestCase.py
View File

@ -75,3 +75,11 @@ class cloudstackTestCase(unittest.case.TestCase):
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
def assertEqual(self, first, second, msg=None):
"""Fail if the two objects are unequal as determined by the '=='
operator.
"""
if isinstance(msg, str):
msg = msg.encode()
super(cloudstackTestCase,self).assertEqual(first,second,msg)

2
tools/marvin/marvin/marvinPlugin.py
View File

@ -171,7 +171,7 @@ class MarvinPlugin(Plugin):
if not self.__testName:
self.__testName = "test"
self.__testClient.identifier = '-'.\
join([self.__identifier, self.__testName])
join([self.__identifier if self.__identifier != None else "marvinTest", self.__testName])
if self.__tcRunLogger:
self.__tcRunLogger.name = test.__str__()