Merge lp:~mandel/ubuntuone-client/unify-filemonitors into lp:ubuntuone-client

[Manuel de la Peña]

Unify the file monitor implementations to simplify the fact that more than one monitor implementation exists on darwin.

Unify the file monitor implementations to simplify the fact that more than one monitor implementation exists on darwin.

[lp:~mandel/ubuntuone-client/unify-filemonitors]

1297. By Manuel de la Peña on 2012-07-16

Merged with changes one on mac.

1298. By Manuel de la Peña on 2012-07-16

Fix broken import.

1299. By Manuel de la Peña on 2012-07-16

Make import line smaller to fit 80 chars.

1300. By Manuel de la Peña on 2012-07-16

Fix the import.

[Mike McCracken (mikemc)]

Looks like the tests need to be changed to reflect the refactor too:

Traceback (most recent call last):
  File "/Users/mmccrack/Documents/Canonical/Source/buildout-env/scripts/devsetup/bin/python", line 58, in <module>
    execfile(__file__)
  File "/Users/mmccrack/Documents/Canonical/Source/buildout-env/scripts/devsetup/parts/ubuntuone-dev-tools/bin/u1trial", line 341, in <module>
    main()
  File "/Users/mmccrack/Documents/Canonical/Source/buildout-env/scripts/devsetup/parts/ubuntuone-dev-tools/bin/u1trial", line 321, in main
    suite = trial_runner.get_suite(config)
  File "/Users/mmccrack/Documents/Canonical/Source/buildout-env/scripts/devsetup/parts/ubuntuone-dev-tools/bin/u1trial", line 192, in get_suite
    config['ignore-paths']))
  File "/Users/mmccrack/Documents/Canonical/Source/buildout-env/scripts/devsetup/parts/ubuntuone-dev-tools/bin/u1trial", line 176, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/Users/mmccrack/Documents/Canonical/Source/buildout-env/scripts/devsetup/parts/ubuntuone-dev-tools/bin/u1trial", line 116, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/Users/mmccrack/Documents/Canonical/Source/buildout-env/scripts/devsetup/parts/unify-filemonitors/tests/platform/filesystem_notifications/test_darwin.py", line 42, in <module>
    from ubuntuone.platform.filesystem_notifications import (
ImportError: cannot import name common

review: Needs Fixing

[lp:~mandel/ubuntuone-client/unify-filemonitors]

1301. By Manuel de la Peña on 2012-07-16

Fix imports.

[Mike McCracken (mikemc)]

The tests now run.

Note that to run the tests you need to have the lp:ubuntuone-fsevents-daemon , and put its python/ subdir on PYTHONPATH.
You also need lp:~diego.sarmentero/+junk/python-macfsevents built and put the build/lib dir on your PYTHONPATH.

Then just run python $u1trial --reactor=twisted -i "test_linux.py,test_windows.py" -p tests/platform/linux tests/platform/filesystem_notifications/

- don't use run-mac-tests because run-mac-tests overwrites PYTHONPATH, and only test the platform/filesystem_notifications/ directory because not everything else is fixed yet.

finally, this will hang on cleanup - there's apparently another branch pending to fix that

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~mandel/ubuntuone-client/unify-filemonitors]

1302. By Manuel de la Peña on 2012-07-17

Merged unify-processors into unify-filemonitors.

1303. By Manuel de la Peña on 2012-07-19

Merged unify-processors into unify-filemonitors.

1304. By Manuel de la Peña on 2012-07-19

Merged unify-processors into unify-filemonitors.

=== modified file 'tests/platform/filesystem_notifications/test_darwin.py'
--- tests/platform/filesystem_notifications/test_darwin.py	2012-07-19 14:25:27 +0000
+++ tests/platform/filesystem_notifications/test_darwin.py	2012-07-19 14:25:27 +0000
@@ -39,14 +39,14 @@
 
 from contrib.testing.testcase import BaseTwistedTestCase
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.platform.filesystem_notifications import (
+from ubuntuone.platform.filesystem_notifications.monitor import (
     common,
 )
-from ubuntuone.platform.filesystem_notifications.darwin import (
+from ubuntuone.platform.filesystem_notifications.monitor.darwin import (
     fsevents_client as filesystem_notifications,
 )
 from ubuntuone.platform.filesystem_notifications import notify_processor
-from ubuntuone.platform.filesystem_notifications.common import (
+from ubuntuone.platform.filesystem_notifications.monitor.common import (
     Watch,
     WatchManager,
 )

=== modified file 'tests/platform/filesystem_notifications/test_fsevents_daemon.py'
--- tests/platform/filesystem_notifications/test_fsevents_daemon.py	2012-07-19 14:25:27 +0000
+++ tests/platform/filesystem_notifications/test_fsevents_daemon.py	2012-07-19 14:25:27 +0000
@@ -34,7 +34,9 @@
 
 from contrib.testing.testcase import BaseTwistedTestCase
 from ubuntuone.darwin import fsevents
-from ubuntuone.platform.filesystem_notifications.darwin import fsevents_daemon
+from ubuntuone.platform.filesystem_notifications.monitor.darwin import (
+    fsevents_daemon,
+)
 from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
     IN_CREATE,
     IN_DELETE,

=== modified file 'tests/platform/filesystem_notifications/test_linux.py'
--- tests/platform/filesystem_notifications/test_linux.py	2012-07-19 14:25:27 +0000
+++ tests/platform/filesystem_notifications/test_linux.py	2012-07-19 14:25:27 +0000
@@ -38,8 +38,8 @@
 from contrib.testing import testcase
 from ubuntuone.syncdaemon import volume_manager
 from ubuntuone.platform.filesystem_notifications import notify_processor
-from ubuntuone.platform.filesystem_notifications import (
-    linux as filesystem_notifications,
+from ubuntuone.platform.filesystem_notifications.monitor import (
+    linux as filesystem_notifications
 )
 from tests.platform.filesystem_notifications import BaseFSMonitorTestCase
 

=== modified file 'tests/platform/filesystem_notifications/test_windows.py'
--- tests/platform/filesystem_notifications/test_windows.py	2012-07-19 14:25:27 +0000
+++ tests/platform/filesystem_notifications/test_windows.py	2012-07-19 14:25:27 +0000
@@ -50,16 +50,16 @@
     IN_DELETE,
     IN_OPEN,
 )
-from ubuntuone.platform.filesystem_notifications import (
+from ubuntuone.platform.filesystem_notifications.monitor import (
     windows as filesystem_notifications,
 )
 from ubuntuone.platform.filesystem_notifications import notify_processor
-from ubuntuone.platform.filesystem_notifications.common import (
+from ubuntuone.platform.filesystem_notifications.monitor.common import (
     FilesystemMonitor,
     Watch,
     WatchManager,
 )
-from ubuntuone.platform.filesystem_notifications.windows import (
+from ubuntuone.platform.filesystem_notifications.monitor.windows import (
     ACTIONS,
     FILE_NOTIFY_CHANGE_FILE_NAME,
     FILE_NOTIFY_CHANGE_DIR_NAME,

=== modified file 'ubuntuone/platform/filesystem_notifications/__init__.py'
--- ubuntuone/platform/filesystem_notifications/__init__.py	2012-07-19 14:25:27 +0000
+++ ubuntuone/platform/filesystem_notifications/__init__.py	2012-07-19 14:25:27 +0000
@@ -28,16 +28,10 @@
 # files in the program, then also delete it here.
 """File System Notification module."""
 
-import sys
-
-from ubuntuone.platform.filesystem_notifications import notify_processor
+from ubuntuone.platform.filesystem_notifications import (
+    monitor,
+    notify_processor,
+)
 
 _GeneralINotifyProcessor = notify_processor.NotifyProcessor
-
-
-if sys.platform in ('darwin', 'win32'):
-    from ubuntuone.platform.filesystem_notifications import common
-    FilesystemMonitor = common.FilesystemMonitor
-else:
-    from ubuntuone.platform.filesystem_notifications import linux
-    FilesystemMonitor = linux.FilesystemMonitor
+FilesystemMonitor = monitor.FilesystemMonitor

=== added directory 'ubuntuone/platform/filesystem_notifications/monitor'
=== added file 'ubuntuone/platform/filesystem_notifications/monitor/__init__.py'
--- ubuntuone/platform/filesystem_notifications/monitor/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/filesystem_notifications/monitor/__init__.py	2012-07-19 14:25:27 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2011-2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Filesystem monitors per platform."""
+
+import sys
+
+if sys.platform in ('win32', 'darwin'):
+    from ubuntuone.platform.filesystem_notifications.monitor import (
+        common,
+    )
+    FilesystemMonitor = common.FilesystemMonitor
+else:
+    from ubuntuone.platform.filesystem_notifications.monitor import (
+        linux,
+    )
+    FilesystemMonitor = linux.FilesystemMonitor

=== renamed file 'ubuntuone/platform/filesystem_notifications/common.py' => 'ubuntuone/platform/filesystem_notifications/monitor/common.py'
--- ubuntuone/platform/filesystem_notifications/common.py	2012-07-19 14:25:27 +0000
+++ ubuntuone/platform/filesystem_notifications/monitor/common.py	2012-07-19 14:25:27 +0000
@@ -54,12 +54,12 @@
 )
 
 if sys.platform == 'darwin':
-    from ubuntuone.platform.filesystem_notifications.darwin import (
+    from ubuntuone.platform.filesystem_notifications.monitor.darwin import (
         fsevents_client,
     )
     source = fsevents_client
 elif sys.platform == 'win32':
-    from ubuntuone.platform.filesystem_notifications import windows
+    from ubuntuone.platform.filesystem_notifications.monitor import windows
     source = windows
 else:
     raise ImportError('Not supported platform')

=== renamed directory 'ubuntuone/platform/filesystem_notifications/darwin' => 'ubuntuone/platform/filesystem_notifications/monitor/darwin'
=== modified file 'ubuntuone/platform/filesystem_notifications/monitor/darwin/__init__.py'
--- ubuntuone/platform/filesystem_notifications/darwin/__init__.py	2012-07-19 14:25:27 +0000
+++ ubuntuone/platform/filesystem_notifications/monitor/darwin/__init__.py	2012-07-19 14:25:27 +0000
@@ -28,7 +28,9 @@
 # files in the program, then also delete it here.
 """Filesystem Notifications module for MAC OS."""
 
-from ubuntuone.platform.filesystem_notifications.darwin import fsevents_daemon
+from ubuntuone.platform.filesystem_notifications.monitor.darwin import (
+    fsevents_daemon,
+)
 
 
 FilesystemMonitor = fsevents_daemon.FilesystemMonitor

=== renamed file 'ubuntuone/platform/filesystem_notifications/linux.py' => 'ubuntuone/platform/filesystem_notifications/monitor/linux.py'
=== renamed file 'ubuntuone/platform/filesystem_notifications/windows.py' => 'ubuntuone/platform/filesystem_notifications/monitor/windows.py'