coverage related, after default encoding change

pull/2171/head
sebres 6 years ago
parent c81de46d21
commit 7dffa7a2a1

@ -186,7 +186,7 @@ class F2B(DefaultTestOptions):
def __init__(self, opts): def __init__(self, opts):
self.__dict__ = opts.__dict__ self.__dict__ = opts.__dict__
if self.fast: if self.fast: # pragma: no cover - normal mode in travis
self.memory_db = True self.memory_db = True
self.no_gamin = True self.no_gamin = True
self.__dict__['share_config'] = {} self.__dict__['share_config'] = {}
@ -658,7 +658,7 @@ class LogCaptureTestCase(unittest.TestCase):
def truncate(self, size=None): def truncate(self, size=None):
"""Truncate the internal buffer and records.""" """Truncate the internal buffer and records."""
if size: if size: # pragma: no cover - not implemented now
raise Exception('invalid size argument: %r, should be None or 0' % size) raise Exception('invalid size argument: %r, should be None or 0' % size)
self._val = '' self._val = ''
with self._lock: with self._lock:
@ -670,8 +670,8 @@ class LogCaptureTestCase(unittest.TestCase):
msg = record.getMessage() + '\n' msg = record.getMessage() + '\n'
try: try:
self._strm.write(msg) self._strm.write(msg)
except UnicodeEncodeError: except UnicodeEncodeError: # pragma: no cover - normally unreachable now
self._strm.write(msg.encode('UTF-8')) self._strm.write(msg.encode('UTF-8', 'replace'))
def getvalue(self): def getvalue(self):
"""Return current buffer as whole string.""" """Return current buffer as whole string."""
@ -698,7 +698,8 @@ class LogCaptureTestCase(unittest.TestCase):
# submit already emitted (delivered to handle) records: # submit already emitted (delivered to handle) records:
for record in recs: for record in recs:
self.__write(record) self.__write(record)
elif lck: # reset dirty buffer flag (if we can lock, otherwise just next time): elif lck: # pragma: no cover - too sporadic for coverage
# reset dirty buffer flag (if we can lock, otherwise just next time):
self._dirty &= ~1 # reset dirty buffer flag self._dirty &= ~1 # reset dirty buffer flag
self._lock.release() self._lock.release()
# cache (outside of log to avoid dead-locking during cross lock within self._strm): # cache (outside of log to avoid dead-locking during cross lock within self._strm):

Loading…
Cancel
Save