ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-19 11:16:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add the 'spurious' notifies

Browse Source
This commit is contained in:
meejah 2015-10-26 11:25:56 -06:00 committed by Brian Warner
parent c156581b73
commit c883977eb6
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -625,6 +625,7 @@ class Downloader(QueueMixin, WriteFileMixin):
if self._should_download(relpath_u, metadata['version']):
extension += [(relpath_u, file_node, metadata)]
else:
self._log("Excluding '{0}'".format(relpath_u))
self._count('objects_excluded')
self._call_hook(None, 'processed')
return extension

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

@ -682,6 +682,7 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
def _wait_for_Bob(ign, downloaded_d):
print "Now waiting for Bob to download\n"
self.magicfolder = self.bob_magicfolder
bob_clock.advance(0)
return downloaded_d
@ -721,6 +722,19 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
self.notify(to_filepath(self.file_path), self.inotify.IN_DELETE)
d.addCallback(_wait_for, Alice_to_delete_file)
def notify_bob_moved(ign):
d0 = self.bob_magicfolder.uploader.set_hook('processed')
self.magicfolder = self.bob_magicfolder
p = abspath_expanduser_unicode(u"file1", base=self.bob_magicfolder.uploader._local_path_u)
self.notify(to_filepath(p), self.inotify.IN_MOVED_FROM)
def foo(x):
self.notify(to_filepath(p + u'.backup'), self.inotify.IN_MOVED_TO)
return ign
d0.addCallback(foo)
return d0
d.addCallback(notify_bob_moved)
d.addCallback(lambda ign: self._check_version_in_dmd(self.alice_magicfolder, u"file1", 1))
d.addCallback(lambda ign: self._check_version_in_local_db(self.alice_magicfolder, u"file1", 1))
d.addCallback(_check_uploader_count, 'objects_failed', 0)
@ -734,6 +748,7 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
def Alice_to_rewrite_file():
print "Alice rewrites file\n"
self.magicfolder = self.alice_magicfolder
self.file_path = abspath_expanduser_unicode(u"file1", base=self.alice_magicfolder.uploader._local_path_u)
fileutil.write(self.file_path, "Alice suddenly sees the white rabbit running into the forest.")
self.notify(to_filepath(self.file_path), self.inotify.IN_CLOSE_WRITE)
@ -771,7 +786,7 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
d.addCallback(lambda ign: self.failIf(os.path.exists(path_u)))
d.addCallback(lambda ign: self._check_version_in_local_db(self.bob_magicfolder, encoded_path_u, None))
d.addCallback(_check_downloader_count, 'objects_excluded', 1)
d.addCallback(_check_downloader_count, 'objects_excluded', 2)
d.addCallback(_check_downloader_count, 'objects_downloaded', 3)
def _cleanup(ign, magicfolder, clock):