Merge lp:~nataliabidart/ubuntuone-client/remove-asserts into lp:ubuntuone-client

[Natalia Bidart]

Fixed test asserts so twisted fails because of the assertion failed and not because timeout.

[Natalia Bidart (nataliabidart)]

Fixed test asserts so twisted fails because of the assertion failed and not because timeout.

[dobey (dobey)]

review: Approve

[Facundo Batista (facundo)]

Like it!

review: Approve

[Facundo Batista (facundo)]

===============================================================================
[ERROR]: tests.syncdaemon.test_eq_inotify.AncestorsUDFTestCase.test_file_events_are_ignored_on_udf_ancestor

Traceback (most recent call last):
Failure: twisted.python.failure.DefaultException:
===============================================================================
[ERROR]: tests.syncdaemon.test_eq_inotify.AncestorsUDFTestCase.test_file_events_are_ignored_on_udf_ancestor

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/twisted/internet/base.py", line 757, in runUntilCurrent
    call.func(*call.args, **call.kw)
  File "/home/facundo/canonical/u1-client/review_remove-watches-even-on-rename/tests/syncdaemon/test_eq_inotify.py", line 1166, in check
    self.assertEquals([], self.listener.events)
  File "/home/facundo/canonical/u1-client/review_remove-watches-even-on-rename/tests/syncdaemon/test_eq_inotify.py", line 1140, in failUnlessEqual
    raise exception
twisted.trial.unittest.FailTest: not equal:
a = []
b = [('VM_UDF_CREATED', (<ubuntuone.syncdaemon.volume_manager.UDF object at 0xa1f8f6c>,), {})]

===============================================================================
[ERROR]: tests.syncdaemon.test_eq_inotify.AncestorsUDFTestCase.test_file_events_are_not_ignored_on_common_prefix_name

Traceback (most recent call last):
Failure: twisted.python.failure.DefaultException:
===============================================================================
[ERROR]: tests.syncdaemon.test_eq_inotify.AncestorsUDFTestCase.test_file_events_are_not_ignored_on_common_prefix_name

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/twisted/internet/base.py", line 757, in runUntilCurrent
    call.func(*call.args, **call.kw)
  File "/home/facundo/canonical/u1-client/review_remove-watches-even-on-rename/tests/syncdaemon/test_eq_inotify.py", line 1245, in check
    self.assertEquals(expected, self.listener.events)
  File "/home/facundo/canonical/u1-client/review_remove-watches-even-on-rename/tests/syncdaemon/test_eq_inotify.py", line 1140, in failUnlessEqual
    raise exception
twisted.trial.unittest.FailTest: not equal:
a = [('FS_FILE_CREATE', ('/home/facundo/canonical/u1-client/review_remove-watches-even-on-rename/_trial_temp/tmp/tests.syncdaemon.test_eq_inotify/AncestorsUDFTestCase/test_file_events_are_not_ignored/tmpdir/ubuntuonehacker/Documents/Reading/Book/testit',), {}), ('FS_FILE_OPEN', ('/home/facundo/canonical/u1-client/review_remove-watches-even-on-rename/_trial_temp/tmp/tests.syncdaemon.test_eq_inotify/AncestorsUDFTestCase/test_file_events_are_not_ignored/tmpdir/ubuntuonehacker/Documents/Reading/Book/testit',), {}), ('FS_FILE_CLOSE_WRITE', ('/home/facundo/canonical/u1-client/review_remove-watches-even-on-rename/_trial_temp/tmp/tests.syncdaemon.test_eq_inotify/AncestorsUDFTestCase/test_file_events_are_not_ignored/tmpdir/ubuntuonehacker/Documents/Reading/Book/testit',), {}), ('FS_FILE_OPEN', ('/home/facundo/canonical/u1-client/review_remove-watches-even-on-rename/_trial_temp/tmp/tests.syncdaemon.test_eq_inotify/AncestorsUDFTestCase/test_file_events_are_not_ignored/tmpdir/ubuntuonehacker/Documents/Reading/...

review: Needs Fixing

[Facundo Batista (facundo)]

> Ran 47 tests in 8.038s
>
> FAILED (errors=8, successes=43)

Ignore this, I'm too stupid to change tabs, :|

[Facundo Batista (facundo)]

review: Approve

[Elliot Murphy (statik)]

The attempt to merge lp:~nataliabidart/ubuntuone-client/remove-asserts into lp:ubuntuone-client failed.Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.65
checking for automake >= 1.10...
(B testing automake-1.11... found 1.11
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
(B testing intltoolize... found 0.41.0
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.22
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: 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...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --prefix=/usr ...
(Bchecking 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... gawk
checking whether make sets $(MAKE)... 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... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
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
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... ...

[dobey (dobey)]

Attempt to merge lp:~nataliabidart/ubuntuone-client/remove-asserts into lp:ubuntuone-client failed due to merge conflicts:

text conflict in tests/syncdaemon/test_localrescan.py

[lp:~nataliabidart/ubuntuone-client/remove-asserts]

330. By Natalia Bidart on 2010-01-26

Merged trunk in and resolved conflicts.

[Natalia Bidart (nataliabidart)]

> Attempt to merge lp:~nataliabidart/ubuntuone-client/remove-asserts into lp
> :ubuntuone-client failed due to merge conflicts:
>
> text conflict in tests/syncdaemon/test_localrescan.py

Conflicts resolved! Thanks.

=== modified file 'tests/syncdaemon/test_eq_inotify.py'
--- tests/syncdaemon/test_eq_inotify.py	2010-01-25 20:43:33 +0000
+++ tests/syncdaemon/test_eq_inotify.py	2010-01-26 12:20:28 +0000
@@ -126,6 +126,26 @@
         """Called to indicate that the tests finished badly."""
         self._deferred.errback(Exception(msg))
 
+    def failUnlessEqual(self, first, second, msg=''):
+        """Fail the test if C{first} and C{second} are not equal.
+
+        @param msg: A string describing the failure that's included in the
+            exception.
+
+        """
+        if not first == second:
+            if msg is None:
+                msg = ''
+            if len(msg) > 0:
+                msg += '\n'
+            exception = self.failureException(
+                '%snot equal:\na = %s\nb = %s\n'
+                % (msg, repr(first), repr(second)))
+            self.finished_error(exception)
+            raise exception
+        return first
+    assertEqual = assertEquals = failUnlessEquals = failUnlessEqual
+
 
 class SignalingTests(BaseTwisted):
     """Test the whole stuff to receive signals."""
@@ -1132,25 +1152,6 @@
 
         BaseTwisted.tearDown(self)
 
-    def failUnlessEqual(self, first, second, msg=''):
-        """
-        Fail the test if C{first} and C{second} are not equal.
-
-        @param msg: A string describing the failure that's included in the
-            exception.
-        """
-        if not first == second:
-            if msg is None:
-                msg = ''
-            if len(msg) > 0:
-                msg += '\n'
-            exception = self.failureException(
-                '%snot equal:\na = %s\nb = %s\n'
-                % (msg, repr(first), repr(second)))
-            self.finished_error(exception)
-        return first
-    assertEqual = assertEquals = failUnlessEquals = failUnlessEqual
-
     def test_file_events_are_ignored_on_udf_ancestor(self):
         """Events on UDF ancestors are ignored."""
         for path in self.ancestors:

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2010-01-25 20:43:33 +0000
+++ tests/syncdaemon/test_localrescan.py	2010-01-26 12:20:28 +0000
@@ -1633,8 +1633,14 @@
     def setUp(self):
         """Init."""
         BaseTestCase.setUp(self)
-        self.deferred = defer.Deferred()
+        self._deferred = defer.Deferred()
         self.eq = event_queue.EventQueue(self.fsm)
+        self.original_add = self.eq.inotify_add_watch
+        self.original_has = self.eq.inotify_has_watch
+        self.watches = []
+        self.eq.inotify_add_watch = lambda path: self.watches.append(path)
+        self.eq.inotify_has_watch = lambda path: path in self.watches
+
         self.lr = LocalRescan(self.vm, self.fsm, self.eq, self.aq)
 
         self.env_var = 'HOME'
@@ -1655,6 +1661,9 @@
 
     def tearDown(self):
         """Cleanup."""
+        self.eq.inotify_add_watch = self.original_add
+        self.eq.inotify_has_watch = self.original_has
+
         self.eq.shutdown()
         self.eq = None
 
@@ -1665,98 +1674,44 @@
 
         BaseTestCase.tearDown(self)
 
-    def SKIP_test_parent_has_watch(self):
-        """UDF's parent has a watch."""
-
-        l = testcase.Listener()
-        self.eq.subscribe(l)
-
-        parent = os.path.dirname(self.udf.path)
-
-        dummy = os.path.join(parent, 'testit')
-        expected = [('FS_FILE_CREATE', (dummy,), {}),
-                    ('FS_FILE_OPEN', (dummy,), {}),
-                    ('FS_FILE_CLOSE_WRITE', (dummy,), {})]
-
-        def parent_has_watch():
-            """Check."""
-            self.assertEquals(expected, l.events)
-            # make the test finish
-            self.deferred.callback(None)
-
-        def modify_parent(_):
-            """Touch a file within UDF's parent."""
-            open(dummy, 'w').close() # touch a dummy file
-
-            reactor.callLater(.1, parent_has_watch)
-
-        d = defer.Deferred()
-        d.addCallback(lambda x: self.lr.start())
-        d.addCallback(modify_parent)
-        d.callback(None)
-
-        self.addCleanup(lambda: self.eq.unsubscribe(l))
-
-        return self.deferred
-
     def test_ancestors_have_watch(self):
         """UDF's ancestors have a watch."""
 
-        original = self.eq.inotify_add_watch
-        watches = []
-        self.eq.inotify_add_watch = lambda path: watches.append(path)
-
         def ancestors_have_watch(_):
             """Check."""
             expected = set(self.ancestors)
-            actual = set(watches)
+            actual = set(self.watches)
             if expected.issubset(actual):
                 # make the test finish ok
-                self.deferred.callback(True)
+                self._deferred.callback(True)
             else:
                 difference = expected.symmetric_difference(actual)
                 msg = 'Expected (%s)\n\n' \
                       'Is not subset of real watches (%s).\n\n' \
-                      'Set difference is: %s.' % (expected, watches, difference)
-                self.deferred.errback(msg)
+                      'Set symmetric difference is: %s.' % \
+                      (expected, actual, difference)
+                self._deferred.errback(msg)
 
-        d = defer.Deferred()
-        d.addCallback(lambda x: self.lr.start())
+        d = self.lr.start()
         d.addCallback(ancestors_have_watch)
-        d.callback(None)
-
-        self.addCleanup(lambda: setattr(self.eq, 'inotify_add_watch', original))
-
-        return self.deferred
+        return self._deferred
 
     def test_watch_is_not_added_if_present(self):
         """Watches are not added if present."""
-        original_add = self.eq.inotify_add_watch
-        original_has = self.eq.inotify_has_watch
-        watches = []
-        self.eq.inotify_add_watch = lambda path: watches.append(path)
-        self.eq.inotify_has_watch = lambda path: path in watches
 
         for path in self.ancestors:
             self.eq.inotify_add_watch(path)
 
         def no_watch_added(_):
             """Check."""
-            for path in self.ancestors:
-                self.assertEquals(1, watches.count(path))
-            self.deferred.callback(None)
+            for path in self.udf.ancestors:
+                self.assertEquals(1, self.watches.count(path))
 
         d = self.lr.start()
         d.addCallback(no_watch_added)
-
-        def restore():
-            """Restore overriden methods."""
-            self.eq.inotify_add_watch = original_add
-            self.eq.inotify_has_watch = original_has
-
-        self.addCleanup(restore)
-
-        return self.deferred
+        d.addCallback(lambda _:
+            self._deferred.callback(None))
+        return self._deferred
 
 
 def test_suite():