Merge lp:~jamesh/mediascanner/ignore-inotify-event-for-deleted-directory into lp:mediascanner/v2

[James Henstridge]

In SubtreeWatcher, ignore inotify events for watches we are no longer interested in.

In SubtreeWatcher.pumpEvents(), we weren't checking whether the inotify event's watch descriptor was one we actually cared about before looking it up in p->wd2str. This kind of access had the unwanted side effect of adding another entry to the map. The simple fix is to check for presence of the watch in the map first.

This problem showed up when building the package on the Launchpad PPA builder, where the inotify events from a directory removal seem to be delivered in a different order to what I see locally or in Jenkins. This makes it difficult to test without an entire stub inotify implementation.

This branch also updates the packaging to always include the test output in the build log even if the tests pass. This makes it easier to compare output in case of failures.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/mediascanner-v2-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner-v2-ci/12/rebuild

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

Ok.

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2013-11-05 13:06:00 +0000
+++ debian/rules	2013-12-03 09:24:28 +0000
@@ -11,3 +11,6 @@
 
 %:
 	dh $@ --parallel --fail-missing
+
+override_dh_auto_test:
+	dh_auto_test --max-parallel=1 -- ARGS="--verbose"

=== modified file 'src/daemon/SubtreeWatcher.cc'
--- src/daemon/SubtreeWatcher.cc	2013-11-28 03:08:09 +0000
+++ src/daemon/SubtreeWatcher.cc	2013-12-03 09:24:28 +0000
@@ -180,6 +180,12 @@
         }
         for(char *d = buf; d < buf + num_read;) {
             struct inotify_event *event = (struct inotify_event *) d;
+            if (p->wd2str.find(event->wd) == p->wd2str.end()) {
+                // Ignore events for unknown watches.  We may receive
+                // such events when a directory is removed.
+                d += sizeof(struct inotify_event) + event->len;
+                continue;
+            }
             string directory = p->wd2str[event->wd];
             string filename(event->name);
             string abspath = directory + '/' + filename;