Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: do not crash when trying to log class setup/teardown fail

Browse Source 
QubesOS/qubes-issues#1691
This commit is contained in:
Marek Marczykowski-Górecki 2016-01-29 21:30:11 +01:00
parent 84af7386f5
commit be00d15d99
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/run.py
View File

@ -133,7 +133,11 @@ class QubesTestResult(unittest.TestResult):
def addError(self, test, err): # pylint: disable=invalid-name def addError(self, test, err): # pylint: disable=invalid-name
super(QubesTestResult, self).addError(test, err) super(QubesTestResult, self).addError(test, err)
test.log.critical('ERROR ({err[0].__name__}: {err[1]!r})'.format(err=err)) try:
test.log.critical(
'ERROR ({err[0].__name__}: {err[1]!r})'.format(err=err))
except AttributeError:
pass
if self.showAll: if self.showAll:
self.stream.writeln( self.stream.writeln(
'{color[red]}{color[bold]}ERROR{color[normal]} ({})'.format( '{color[red]}{color[bold]}ERROR{color[normal]} ({})'.format(
@ -157,7 +161,10 @@ class QubesTestResult(unittest.TestResult):
def addSkip(self, test, reason): # pylint: disable=invalid-name def addSkip(self, test, reason): # pylint: disable=invalid-name
super(QubesTestResult, self).addSkip(test, reason) super(QubesTestResult, self).addSkip(test, reason)
test.log.warning('skipped ({})'.format(reason)) try:
test.log.warning('skipped ({})'.format(reason))
except AttributeError:
pass
if self.showAll: if self.showAll:
self.stream.writeln( self.stream.writeln(
'{color[cyan]}skipped{color[normal]} ({})'.format( '{color[cyan]}skipped{color[normal]} ({})'.format(