From e22fd89f70e15cfbd02c0b2b0033c8d5b8456eef Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Mon, 8 Jun 2015 14:23:30 +0100 Subject: [PATCH] Cosmetics. Signed-off-by: Daira Hopwood --- src/allmydata/frontends/drop_upload.py | 14 +++++++++----- src/allmydata/test/test_drop_upload.py | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py index e5523ff9..723e0e83 100644 --- a/src/allmydata/frontends/drop_upload.py +++ b/src/allmydata/frontends/drop_upload.py @@ -27,7 +27,7 @@ def get_inotify_module(): from twisted.internet import inotify else: raise NotImplementedError("filesystem notification needed for drop-upload is not supported.\n" - "This currently requires Linux or Windows.") + "This currently requires Linux or Windows.") return inotify except (ImportError, AttributeError) as e: log.msg(e) @@ -90,10 +90,14 @@ class DropUploader(service.MultiService): # We don't watch for IN_CREATE, because that would cause us to read and upload a # possibly-incomplete file before the application has closed it. There should always # be an IN_CLOSE_WRITE after an IN_CREATE (I think). - # TODO: what about IN_MOVE_SELF or IN_UNMOUNT? - #self.mask = inotify.IN_CLOSE_WRITE | inotify.IN_MOVED_TO | inotify.IN_ONLYDIR - #self.mask = inotify.IN_CLOSE_WRITE | inotify.IN_MOVED_TO | inotify.IN_MOVED_FROM | inotify.IN_ONLYDIR | IN_EXCL_UNLINK - self.mask = inotify.IN_CLOSE_WRITE | inotify.IN_MOVED_TO | inotify.IN_ONLYDIR | IN_EXCL_UNLINK | inotify.IN_DELETE + # TODO: what about IN_MOVE_SELF, IN_MOVED_FROM, or IN_UNMOUNT? + # + self.mask = ( inotify.IN_CLOSE_WRITE + | inotify.IN_MOVED_TO + | inotify.IN_DELETE + | inotify.IN_ONLYDIR + | IN_EXCL_UNLINK + ) self._notifier.watch(self._local_path, mask=self.mask, callbacks=[self._notify], recursive=True) diff --git a/src/allmydata/test/test_drop_upload.py b/src/allmydata/test/test_drop_upload.py index e6dab77c..5c19995d 100644 --- a/src/allmydata/test/test_drop_upload.py +++ b/src/allmydata/test/test_drop_upload.py @@ -275,7 +275,7 @@ class DropUploadTestMixin(GridTestMixin, ShouldFailMixin, ReallyEqualMixin, NonA d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('drop_upload.directories_created'), 1)) d.addBoth(self._cleanup) return d - + def test_drop_upload(self): self.set_up_grid() self.local_dir = os.path.join(self.basedir, self.unicode_or_fallback(u"loc\u0101l_dir", u"local_dir")) -- 2.45.2