merge and fix conflicts
This commit is contained in:
@@ -180,6 +180,7 @@ class _NullColorizer(object):
|
|||||||
def write(self, text, color):
|
def write(self, text, color):
|
||||||
self.stream.write(text)
|
self.stream.write(text)
|
||||||
|
|
||||||
|
|
||||||
class NovaTestResult(result.TextTestResult):
|
class NovaTestResult(result.TextTestResult):
|
||||||
def __init__(self, *args, **kw):
|
def __init__(self, *args, **kw):
|
||||||
result.TextTestResult.__init__(self, *args, **kw)
|
result.TextTestResult.__init__(self, *args, **kw)
|
||||||
|
Reference in New Issue
Block a user