1
=== modified file 'tests/platform/linux/test_filesystem_notifications.py'
2
--- tests/platform/linux/test_filesystem_notifications.py	2012-04-09 20:07:05 +0000
3
+++ tests/platform/linux/test_filesystem_notifications.py	2012-05-23 13:13:20 +0000
4
@@ -34,6 +34,7 @@
5
34
import os
34
import os
6
35
35
7
36
from twisted.internet import defer, reactor
36
from twisted.internet import defer, reactor
8
37
from twisted.trial.unittest import TestCase as PlainTestCase
9
37
38
10
38
from ubuntuone.syncdaemon import (
39
from ubuntuone.syncdaemon import (
11
39
    event_queue,
40
    event_queue,
12
@@ -434,3 +435,43 @@
13
434
        self.monitor.rm_watch(path_ancestor)
435
        self.monitor.rm_watch(path_ancestor)
14
435
        self.assertEqual(self.monitor._general_watchs, {})
436
        self.assertEqual(self.monitor._general_watchs, {})
15
436
        self.assertEqual(self.monitor._ancestors_watchs, {})
437
        self.assertEqual(self.monitor._ancestors_watchs, {})
16
438
17
439
18
440
class FakeEvent(object):
19
441
    """A fake event."""
20
442
21
443
    mask = 0
22
444
    name = ""
23
445
24
446
25
447
class ECryptFsTestCase(PlainTestCase):
26
448
    """Tests for the eCryptFS weirdness."""
27
449
28
450
    def test_close_write_on_folders_is_ignored(self):
29
451
        """When eCryptFS sends CLOSE_WRITE on folders, ignore it"""
30
452
        result = []
31
453
        monitor = None
32
454
        processor = filesystem_notifications._GeneralINotifyProcessor(monitor)
33
455
        self.patch(processor.general_processor, "push_event", result.append)
34
456
35
457
        fake_event = FakeEvent()
36
458
        fake_event.mask = filesystem_notifications.pyinotify.IN_ISDIR
37
459
        fake_event.name = "/fake/directory/path"
38
460
        processor.process_IN_CLOSE_WRITE(fake_event)
39
461
40
462
        self.assertNotIn(fake_event, result)
41
463
42
464
43
465
    def test_close_write_on_files_is_handled(self):
44
466
        """When anything sends CLOSE_WRITE on files, handle it."""
45
467
        result = []
46
468
        monitor = None
47
469
        processor = filesystem_notifications._GeneralINotifyProcessor(monitor)
48
470
        self.patch(processor.general_processor, "push_event", result.append)
49
471
50
472
        fake_event = FakeEvent()
51
473
        fake_event.mask = filesystem_notifications.pyinotify.IN_CLOSE_WRITE
52
474
        fake_event.name = "/fake/directory/path"
53
475
        processor.process_IN_CLOSE_WRITE(fake_event)
54
476
55
477
        self.assertIn(fake_event, result)
56
437
478
57
=== modified file 'ubuntuone/platform/linux/filesystem_notifications.py'
58
--- ubuntuone/platform/linux/filesystem_notifications.py	2012-04-09 20:07:05 +0000
59
+++ ubuntuone/platform/linux/filesystem_notifications.py	2012-05-23 13:13:20 +0000
60
@@ -214,6 +214,16 @@
61
214
        if not (event.mask & pyinotify.IN_ISDIR):
214
        if not (event.mask & pyinotify.IN_ISDIR):
62
215
            self.general_processor.push_event(event)
215
            self.general_processor.push_event(event)
63
216
216
64
217
    @validate_filename
65
218
    def process_IN_CLOSE_WRITE(self, event):
66
219
        """Filter IN_CLOSE_WRITE to make it happen only in files.
67
220
68
221
        eCryptFS sends IN_CLOSE_WRITE event for lower directories.
69
222
70
223
        """
71
224
        if not (event.mask & pyinotify.IN_ISDIR):
72
225
            self.general_processor.push_event(event)
73
226
74
217
    def process_IN_MOVE_SELF(self, event):
227
    def process_IN_MOVE_SELF(self, event):
75
218
        """Don't do anything here.
228
        """Don't do anything here.
76
219
229
Reviewer	Date Requested	Status
Diego Sarmentero (community)		Approve on 2012-06-08
dobey (community)	2012-05-21	Approve on 2012-06-08
Review via email: mp+106629@code.launchpad.net