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)
def _create_file_without_event(res):
print "CREATE FILE WITHOUT EMITTING EVENT"
- uploaded_d = self.magicfolder.uploader.set_hook('processed')
+ processed_d = self.magicfolder.uploader.set_hook('processed')
what_path = abspath_expanduser_unicode(u"what", base=new_empty_tree_dir)
fileutil.write(what_path, "say when")
print "ADVANCE CLOCK"
- #alice_clock.advance(self.magicfolder.uploader._periodic_full_scan_duration + 1)
- return uploaded_d
+ alice_clock.advance(self.magicfolder.uploader._periodic_full_scan_duration + 1)
+ return processed_d
d.addCallback(_create_file_without_event)
def _advance_clock(res):
print "_advance_clock"
- alice_clock.advance(self.magicfolder.uploader._periodic_full_scan_duration + 1)
- d.addCallback(_advance_clock)
- d.addCallback(_advance_clock)
+ processed_d = self.magicfolder.uploader.set_hook('processed')
+ alice_clock.advance(0)
+ return processed_d
d.addCallback(_advance_clock)
d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.files_uploaded'), 1))
- d.addCallback(lambda ign: self.magicfolder.finish())
+ def cleanup(res):
+ d2 = self.magicfolder.finish()
+ alice_clock.advance(0)
+ return d2
+ d.addCallback(cleanup)
return d
class RealTest(MagicFolderTestMixin, unittest.TestCase):