Merge lp:~mandel/ubuntuone-client/clean-imports into lp:ubuntuone-client

[Manuel de la Peña]

- Clean the location of the filemonitor imports (LP:1026212).

- Clean the location of the filemonitor imports (LP:1026212).

[Alejandro J. Cura (alecu)]

+1

review: Approve

[Mike McCracken (mikemc)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:ubuntuone-client failed due to conflicts:

text conflict in ubuntuone/platform/filesystem_notifications/__init__.py
text conflict in ubuntuone/syncdaemon/event_queue.py

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mandel/ubuntuone-client/clean-imports into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.69
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.5
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.18
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking how to print strings... printf
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
chec...

=== modified file 'tests/platform/filesystem_notifications/test_filesystem_notifications.py'
--- tests/platform/filesystem_notifications/test_filesystem_notifications.py	2012-07-10 20:11:18 +0000
+++ tests/platform/filesystem_notifications/test_filesystem_notifications.py	2012-07-31 08:29:18 +0000
@@ -46,9 +46,7 @@
     remove_dir,
     rename,
 )
-from ubuntuone.platform.filesystem_notifications import (
-    _GeneralINotifyProcessor,
-)
+from ubuntuone.platform.filesystem_notifications import notify_processor
 from ubuntuone.syncdaemon.tritcask import Tritcask
 from ubuntuone.syncdaemon import (
     event_queue,
@@ -62,19 +60,19 @@
 
     def test_filter_none(self):
         """Still works ok even if not receiving a regex to ignore."""
-        p = _GeneralINotifyProcessor(None)
+        p = notify_processor.NotifyProcessor(None)
         self.assertFalse(p.is_ignored("froo.pyc"))
 
     def test_filter_one(self):
         """Filters stuff that matches (or not) this one regex."""
-        p = _GeneralINotifyProcessor(None, ['\A.*\\.pyc\Z'])
+        p = notify_processor.NotifyProcessor(None, ['\A.*\\.pyc\Z'])
         self.assertTrue(p.is_ignored("froo.pyc"))
         self.assertFalse(p.is_ignored("froo.pyc.real"))
         self.assertFalse(p.is_ignored("otherstuff"))
 
     def test_filter_two_simple(self):
         """Filters stuff that matches (or not) these simple regexes."""
-        p = _GeneralINotifyProcessor(None, ['\A.*foo\Z', '\A.*bar\Z'])
+        p = notify_processor.NotifyProcessor(None, ['\A.*foo\Z', '\A.*bar\Z'])
         self.assertTrue(p.is_ignored("blah_foo"))
         self.assertTrue(p.is_ignored("blah_bar"))
         self.assertFalse(p.is_ignored("bar_xxx"))
@@ -83,7 +81,7 @@
 
     def test_filter_two_complex(self):
         """Filters stuff that matches (or not) these complex regexes."""
-        p = _GeneralINotifyProcessor(None,
+        p = notify_processor.NotifyProcessor(None,
                                      ['\A.*foo\Z|\Afoo.*\Z', '\A.*bar\Z'])
         self.assertTrue(p.is_ignored("blah_foo"))
         self.assertTrue(p.is_ignored("blah_bar"))
@@ -98,7 +96,7 @@
         store_call = lambda *args: calls.append(args)
         self.patch(filesystem_notifications, "access", store_call)
         self.patch(filesystem_notifications, "path_exists", lambda _: True)
-        p = _GeneralINotifyProcessor(None)
+        p = notify_processor.NotifyProcessor(None)
         p.is_ignored(sample_path)
         self.assertEqual(calls, [(sample_path,)])
 

=== modified file 'ubuntuone/syncdaemon/event_queue.py'
--- ubuntuone/syncdaemon/event_queue.py	2012-07-26 22:00:58 +0000
+++ ubuntuone/syncdaemon/event_queue.py	2012-07-31 08:29:18 +0000
@@ -38,7 +38,9 @@
 from twisted.internet import defer
 
 from ubuntuone.platform.os_helper import access
-from ubuntuone.platform.filesystem_notifications.monitor import FilesystemMonitor
+from ubuntuone.platform.filesystem_notifications.monitor import (
+    FilesystemMonitor,
+)
 
 # these are our internal events, what is inserted into the whole system
 EVENTS = {