Merge lp:~facundo/ubuntuone-client/different-dir-deletion-check into lp:ubuntuone-client

[Facundo Batista]

Check where to call handle_dir_delete in a better place.

Check where to call handle_dir_delete in a better place.

This is to not skip the signal if faked from different move situations.

Tests included.

[Guillermo Gonzalez (verterok)]

+1

review: Approve

[Facundo Batista (facundo)]

Approving with one review

review: Approve

=== modified file 'tests/syncdaemon/test_eq_inotify.py'
--- tests/syncdaemon/test_eq_inotify.py	2012-01-18 20:47:18 +0000
+++ tests/syncdaemon/test_eq_inotify.py	2012-02-09 14:42:13 +0000
@@ -1375,6 +1375,9 @@
                 if path != fromdir:
                     self.finished_error("received a wrong path")
                 else:
+                    # file deletion should remove its watch
+                    self.assertNotIn(path, self.eq.monitor._general_watchs)
+
                     remove_dir(todir)
                     remove_dir(helpdir)
                     self.finished_ok()
@@ -1467,6 +1470,11 @@
         todir = os.path.join(self.root_dir, "bar")
         make_dir(fromdir)
 
+        # patch to check proper dir deletion is handled
+        called = []
+        self.patch(self.eq.monitor._processor.general_processor,
+                   'handle_dir_delete', lambda p: called.append(p))
+
         # patch the general processor to ignore all that ends with bar
         self.patch(self.eq.monitor._processor.general_processor, "is_ignored",
                    lambda path: path.endswith("bar"))
@@ -1479,6 +1487,7 @@
         # generate the event
         rename(fromdir, todir)
         yield self._deferred
+        self.assertEqual(called, [fromdir])
 
     @defer.inlineCallbacks
     def test_file_moved_from_ignored(self):
@@ -1971,6 +1980,11 @@
         yield self._create_udf('vol2', base2)
         self.fs.create(path=base2, share_id='vol2', is_dir=True)
 
+        # patch to check proper dir deletion is handled
+        called = []
+        self.patch(self.eq.monitor._processor.general_processor,
+                   'handle_dir_delete', lambda p: called.append(p))
+
         # working stuff
         moving1 = os.path.join(base1, "test")
         moving2 = os.path.join(base2, "test")
@@ -1987,6 +2001,7 @@
         # generate the event
         rename(moving1, moving2)
         yield self._deferred
+        self.assertEqual(called, [moving1])
 
     @defer.inlineCallbacks
     def test_move_file_across_volumes(self):
 
=== modified file 'ubuntuone/syncdaemon/filesystem_notifications.py'
--- ubuntuone/syncdaemon/filesystem_notifications.py	2011-09-15 21:14:24 +0000
+++ ubuntuone/syncdaemon/filesystem_notifications.py	2012-02-09 14:42:13 +0000
@@ -125,6 +125,8 @@
 
     def eq_push(self, event_name, **event_data):
         """Sends to EQ the event data, maybe filtering it."""
+        if event_name == 'FS_DIR_DELETE':
+            self.handle_dir_delete(event_data['path'])
         if not self._to_mute.pop(event_name, **event_data):
             self.monitor.eq.push(event_name, **event_data)
 
@@ -149,8 +151,6 @@
                 return
 
         if not self.is_ignored(event.pathname):
-            if evt_name == 'FS_DIR_DELETE':
-                self.handle_dir_delete(event.pathname)
             self.eq_push(evt_name, path=event.pathname)
 
     def freeze_begin(self, path):