mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-20 13:33:09 +00:00
util.log: send log.err to Twisted too, so that Trial tests are flunked
This commit is contained in:
parent
a997d65d74
commit
8854d0c1b5
@ -1,5 +1,6 @@
|
|||||||
|
|
||||||
from foolscap.logging import log
|
from foolscap.logging import log
|
||||||
|
from twisted.python import log as tw_log
|
||||||
|
|
||||||
NOISY = log.NOISY # 10
|
NOISY = log.NOISY # 10
|
||||||
OPERATIONAL = log.OPERATIONAL # 20
|
OPERATIONAL = log.OPERATIONAL # 20
|
||||||
@ -13,8 +14,13 @@ BAD = log.BAD # 40
|
|||||||
|
|
||||||
msg = log.msg
|
msg = log.msg
|
||||||
|
|
||||||
|
# If log.err() happens during a unit test, the unit test should fail. We
|
||||||
|
# accomplish this by sending it to twisted.log too. When a WEIRD/SCARY/BAD
|
||||||
|
# thing happens that is nevertheless handled, use log.msg(failure=f,
|
||||||
|
# level=WEIRD) instead.
|
||||||
|
|
||||||
def err(*args, **kwargs):
|
def err(*args, **kwargs):
|
||||||
# this should probably be in foolscap
|
tw_log.err(*args, **kwargs)
|
||||||
if 'level' not in kwargs:
|
if 'level' not in kwargs:
|
||||||
kwargs['level'] = log.UNUSUAL
|
kwargs['level'] = log.UNUSUAL
|
||||||
return log.err(*args, **kwargs)
|
return log.err(*args, **kwargs)
|
||||||
|
Loading…
Reference in New Issue
Block a user