[tracker-miners: 12/12] Merge branch 'sam/functional-tests-2' into 'master'

[Sam Thursfield <sthursfield src gnome org>]

commit f2800b636a55ef2df1e9a533b3269454597260c0
Merge: 85f6467b9 35ef96381
Author: Sam Thursfield <sam afuera me uk>
Date:   Sat Jul 21 17:04:24 2018 +0000

    Merge branch 'sam/functional-tests-2' into 'master'
    
    Further functional-test fixes
    
    See merge request GNOME/tracker-miners!9

 tests/functional-tests/300-miner-basic-ops.py      |  14 +--
 .../functional-tests/301-miner-resource-removal.py |  12 ++-
 tests/functional-tests/311-fts-file-operations.py  |   7 +-
 tests/functional-tests/410-extractor-decorator.py  |  11 +-
 tests/functional-tests/600-applications-camera.py  |  20 ++--
 tests/functional-tests/Makefile.am                 |  10 +-
 tests/functional-tests/common/utils/helpers.py     | 114 +++++++++++----------
 tests/functional-tests/common/utils/minertest.py   |  10 +-
 .../functional-tests/common/utils/writebacktest.py |   4 +-
 tests/functional-tests/meson.build                 |  10 +-
 tests/functional-tests/test-runner.sh              |   2 +-
 11 files changed, 120 insertions(+), 94 deletions(-)
---