ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-20 17:52:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further work in progress refinements to unit tests

Browse Source 
wip from pairing with Daira and Meejah
This commit is contained in:
David Stainton 2016-01-28 17:43:40 +00:00 committed by Brian Warner
parent 9483d24f67
commit 71e3164e92
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ class QueueMixin(HookMixin):
self._lazy_tail.addBoth(self._logcb, "whawhat else %r" % (item,))
self._lazy_tail.addCallback(lambda ign: self._process(item))
self._lazy_tail.addBoth(self._logcb, "got past _process")
self._lazy_tail.addBoth(self._call_hook, 'processed')
self._lazy_tail.addBoth(self._call_hook, 'processed', async=True)
self._lazy_tail.addBoth(self._logcb, "got past _call_hook (turn_delay = %r)" % (self._turn_delay,))
self._lazy_tail.addCallback(lambda ign: task.deferLater(self._clock, self._turn_delay, self._turn_deque))
self._lazy_tail.addBoth(self._logcb, "got past deferLater")
@ -688,7 +688,7 @@ class Downloader(QueueMixin, WriteFileMixin):
self._deque.append( (relpath_u, file_node, metadata) )
else:
self._log("Excluding %r" % (relpath_u,))
self._call_hook(None, 'processed')
self._call_hook(None, 'processed', async=True)
self._log("deque after = %r" % (self._deque,))
d.addCallback(_filter_batch_to_deque)

8
src/allmydata/test/test_magic_folder.py
View File

@ -849,8 +849,12 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
def notify_bob_moved(ign):
d0 = self.bob_magicfolder.uploader.set_hook('processed')
p = abspath_expanduser_unicode(u"file1", base=self.bob_magicfolder.uploader._local_path_u)
self.notify(to_filepath(p), self.inotify.IN_MOVED_FROM, magic=self.bob_magicfolder, flush=False)
self.notify(to_filepath(p + u'.backup'), self.inotify.IN_MOVED_TO, magic=self.bob_magicfolder)
if sys.platform == "win32":
self.notify(to_filepath(p), self.inotify.IN_MOVED_FROM, magic=self.bob_magicfolder, flush=False)
self.notify(to_filepath(p + u'.backup'), self.inotify.IN_MOVED_TO, magic=self.bob_magicfolder)
else:
self.notify(to_filepath(p + u'.backup'), self.inotify.IN_CREATE, magic=self.bob_magicfolder, flush=False)
self.notify(to_filepath(p), self.inotify.IN_DELETE, magic=self.bob_magicfolder)
bob_clock.advance(0)
return d0
d.addCallback(notify_bob_moved)