tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Improve reporting of assertion failures. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-10-30 02:03:26 +00:00
parent 0583141543
commit 38bf092525
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/frontends/magic_folder.py
View File

@ -13,7 +13,7 @@ from allmydata.util import fileutil
from allmydata.interfaces import IDirectoryNode from allmydata.interfaces import IDirectoryNode
from allmydata.util import log from allmydata.util import log
from allmydata.util.fileutil import precondition_abspath, get_pathinfo, ConflictError from allmydata.util.fileutil import precondition_abspath, get_pathinfo, ConflictError
from allmydata.util.assertutil import precondition from allmydata.util.assertutil import precondition, _assert
from allmydata.util.deferredutil import HookMixin from allmydata.util.deferredutil import HookMixin
from allmydata.util.encodingutil import listdir_filepath, to_filepath, \ from allmydata.util.encodingutil import listdir_filepath, to_filepath, \
extend_filepath, unicode_from_filepath, unicode_segments_from, \ extend_filepath, unicode_from_filepath, unicode_segments_from, \
@ -254,7 +254,7 @@ class Uploader(QueueMixin):
d = defer.succeed(None) d = defer.succeed(None)
for child in children: for child in children:
assert isinstance(child, unicode), child _assert(isinstance(child, unicode), child=child)
d.addCallback(lambda ign, child=child: d.addCallback(lambda ign, child=child:
("%s/%s" % (reldir_u, child) if reldir_u else child)) ("%s/%s" % (reldir_u, child) if reldir_u else child))
def _add_pending(relpath_u): def _add_pending(relpath_u):
@ -406,7 +406,7 @@ class Uploader(QueueMixin):
return res return res
def _failed(f): def _failed(f):
self._count('objects_failed') self._count('objects_failed')
self._log("%r while processing %r" % (f, relpath_u)) self._log("%s while processing %r" % (f, relpath_u))
return f return f
d.addCallbacks(_succeeded, _failed) d.addCallbacks(_succeeded, _failed)
return d return d