Merge lp:~mandel/ubuntuone-client/fix-802726 into lp:ubuntuone-client

[Manuel de la Peña]

- Added an extra filtering to ensure that the IN_OPEN|IN_ISDIR masked events do not get to the fsm (LP: #802726).

fixes: lp:802726

Adds an extra filtering to ensure that the IN_OPEN|IN_ISDIR masked events do not get to the fsm.

[lp:~mandel/ubuntuone-client/fix-802726]

1031. By Manuel de la Peña on 2011-06-29

Link bug

[Natalia Bidart (nataliabidart)]

Very good!

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'tests/platform/windows/test_filesystem_notifications.py'
--- tests/platform/windows/test_filesystem_notifications.py	2011-04-01 16:07:13 +0000
+++ tests/platform/windows/test_filesystem_notifications.py	2011-06-30 12:21:13 +0000
@@ -71,7 +71,7 @@
             FILE_NOTIFY_CHANGE_LAST_ACCESS
 
     def _perform_operations(self, path, mask, auto_add, actions, number_events):
-        """Performs the file operations and returns the recorded events."""
+        """Perform the file operations and returns the recorded events."""
         manager = WatchManager()
         manager.add_watch(path, mask, auto_add=auto_add)
         handler = TestCaseHandler()
@@ -85,6 +85,22 @@
         notifier.stop()
         return events
 
+    def _perform_timed_operations(self, path, mask, auto_add, actions,
+                                  time_out):
+        """Perform the file operations and returns the recorded events."""
+        manager = WatchManager()
+        manager.add_watch(path, mask, auto_add=auto_add)
+        handler = TestCaseHandler()
+        notifier = Notifier(manager, handler)
+        # execution the actions
+        actions()
+        # process the recorded events
+        time.sleep(time_out)
+        notifier.process_events()
+        events = handler.processed_events
+        notifier.stop()
+        return events
+
     def test_file_create(self):
         """Test that the correct event is returned on a file create."""
         file_name = os.path.join(self.basedir, 'test_file_create')
@@ -368,6 +384,20 @@
         notifier.stop()
         self.assertEqual(0, len(handler.processed_events))
 
+    def test_open_dir_muted(self):
+        """Test that the opening of dirs is ignored."""
+        dir_name = os.path.join(tempfile.mkdtemp(), 'test_dir_open')
+        # create file before we record
+        os.mkdir(dir_name)
+
+        def open_dir():
+            """Action for the test."""
+            os.startfile(dir_name)
+
+        events = self._perform_timed_operations(self.basedir, self.mask, False,
+            open_dir, 2)
+        self.assertEqual(0, len(events))
+
 
 class TestWatchManager(MockerTestCase):
     """Test the watch manager."""
@@ -452,6 +482,8 @@
         """Test the wd is returned when there is a watch for the path."""
         self.manager._wdm = {1: self.watch}
         path = 'path'
+        self.watch.auto_add
+        self.mocker.result(True)
         self.watch.path
         self.mocker.result(path)
         self.mocker.replay()
@@ -482,12 +514,12 @@
         path = 'path'
         self.watch.path
         self.mocker.result(path)
-        self.watch.path
-        self.mocker.result(path)
-        self.watch.stop_watching()
+        self.watch.auto_add
+        self.mocker.result(True)
+        self.watch.exclude_filter = ANY
         self.mocker.replay()
         self.manager.rm_path(path)
-        self.assertEqual(None, self.manager._wdm.get(1))
+        self.assertEqual(self.watch, self.manager._wdm.get(1))
 
     def test_rm_child_path(self):
         """Test the removal of a child path."""
@@ -495,8 +527,6 @@
         path = 'path'
         self.watch.path
         self.mocker.result(path)
-        self.watch.path
-        self.mocker.result(path)
         self.watch.auto_add
         self.mocker.result(True)
         self.watch.exclude_filter = ANY

=== modified file 'ubuntuone/platform/windows/filesystem_notifications.py'
--- ubuntuone/platform/windows/filesystem_notifications.py	2011-06-29 20:11:28 +0000
+++ ubuntuone/platform/windows/filesystem_notifications.py	2011-06-30 12:21:13 +0000
@@ -171,6 +171,12 @@
             self._subdirs.append(path)
         return is_dir
 
+    def _is_excluded(self, event):
+        """Return if an event is ignored."""
+        return (self.exclude_filter and self.exclude_filter(event)) or\
+            event.mask == IN_OPEN | IN_ISDIR
+
+
     def _process_events(self):
         """Process the events form the queue."""
         # we transform the events to be the same as the one in pyinotify
@@ -221,7 +227,7 @@
             # the exclude filter returns False, that is, the event will not
             # be excluded
             self.log.debug('Event is %s.', event)
-            if not self.exclude_filter or not self.exclude_filter(event):
+            if not self._is_excluded(event):
                 self.log.debug('Addding event %s to queue.', event)
                 self.events_queue.put(event)