Test inotify with event agnostic notify

def notify(self, path, mask)
instead of
def notify_close_write(self, path)

diff --git a/src/allmydata/test/test_drop_upload.py b/src/allmydata/test/test_drop_upload.py
index 424c498d7ca878092c1064766c9bfa07c5dd7497..605a3b91e08ba9536f99d8201133ff02890ccfb7 100644 (file)
--- a/src/allmydata/test/test_drop_upload.py
+++ b/src/allmydata/test/test_drop_upload.py
@@ -360,8 +360,9 @@ class MockTest(DropUploadTestMixin, unittest.TestCase):
         DropUploadTestMixin.setUp(self)
         self.inotify = fake_inotify
 
-    def notify_close_write(self, path):
-        self.uploader._notifier.event(path, self.inotify.IN_CLOSE_WRITE)
+
+    def notify(self, path, mask):
+        self.uploader._notifier.event(path, mask)
 
     def test_errors(self):
         self.set_up_grid()
@@ -401,8 +402,8 @@ class RealTest(DropUploadTestMixin, unittest.TestCase):
         DropUploadTestMixin.setUp(self)
         self.inotify = None
 
-    def notify_close_write(self, path):
-        # Writing to the file causes the notification.
+    def notify(self, path, mask):
+        # Writing to the filesystem causes the notification.
         pass
 
 if sys.platform != "win32" and not runtime.platform.supportsINotify():