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

Flush handling WIP.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-10-27 20:07:41 +00:00
parent ecc944d5f1
commit 3a6a62c6d1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -621,10 +621,9 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
f.close() f.close()
if temporary and sys.platform == "win32": if temporary and sys.platform == "win32":
os.unlink(path_u) os.unlink(path_u)
self.notify(path, self.inotify.IN_DELETE) self.notify(path, self.inotify.IN_DELETE, flush=False)
event_mask = self.inotify.IN_CLOSE_WRITE event_mask = self.inotify.IN_CLOSE_WRITE
fileutil.flush_volume(path_u)
self.notify(path, event_mask) self.notify(path, event_mask)
encoded_name_u = magicpath.path2magic(name_u) encoded_name_u = magicpath.path2magic(name_u)
@ -733,7 +732,7 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
def notify_bob_moved(ign): def notify_bob_moved(ign):
d0 = self.bob_magicfolder.uploader.set_hook('processed') d0 = self.bob_magicfolder.uploader.set_hook('processed')
p = abspath_expanduser_unicode(u"file1", base=self.bob_magicfolder.uploader._local_path_u) 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) 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) self.notify(to_filepath(p + u'.backup'), self.inotify.IN_MOVED_TO, magic=self.bob_magicfolder)
bob_clock.advance(0) bob_clock.advance(0)
return d0 return d0
@ -869,10 +868,11 @@ class MockTest(MagicFolderTestMixin, unittest.TestCase):
self.inotify = fake_inotify self.inotify = fake_inotify
self.patch(magic_folder, 'get_inotify_module', lambda: self.inotify) self.patch(magic_folder, 'get_inotify_module', lambda: self.inotify)
def notify(self, path, mask, magic=None): def notify(self, path, mask, magic=None, flush=True):
if magic is None: if magic is None:
magic = self.magicfolder magic = self.magicfolder
magic.uploader._notifier.event(path, mask) magic.uploader._notifier.event(path, mask)
# no flush for the mock test.
def test_errors(self): def test_errors(self):
self.set_up_grid() self.set_up_grid()
@ -959,9 +959,11 @@ class RealTest(MagicFolderTestMixin, unittest.TestCase):
MagicFolderTestMixin.setUp(self) MagicFolderTestMixin.setUp(self)
self.inotify = magic_folder.get_inotify_module() self.inotify = magic_folder.get_inotify_module()
def notify(self, path, mask, **kw): def notify(self, path, mask, magic=None, flush=True):
# Writing to the filesystem causes the notification. # Writing to the filesystem causes the notification.
pass # However, flushing filesystem buffers may be necessary on Windows.
if flush:
fileutil.flush_volume(path)
try: try:
magic_folder.get_inotify_module() magic_folder.get_inotify_module()