[tracker: 6/6] Merge branch 'sam/functional-test-30x-fixes'

[Sam Thursfield <sthursfield src gnome org>]

commit 70f1bcc450407f8373d8690ea9c674bdff9c2741
Merge: 34d360d 7789afd
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri Dec 26 00:53:40 2014 +0000

    Merge branch 'sam/functional-test-30x-fixes'

 src/libtracker-miner/tracker-file-notifier.c       |    7 ++-
 tests/functional-tests/300-miner-basic-ops.py      |   50 +++++------
 .../functional-tests/301-miner-resource-removal.py |   94 ++++++-------------
 tests/functional-tests/310-fts-indexing.py         |   37 +++++---
 tests/functional-tests/common/utils/helpers.py     |   95 +++++++++++---------
 tests/functional-tests/common/utils/minertest.py   |   16 ++--
 tests/functional-tests/common/utils/system.py      |   37 +-------
 7 files changed, 145 insertions(+), 191 deletions(-)
---