[tracker: 7/7] Merge branch 'sam/test-fixes' into 'master'

[Sam Thursfield <sthursfield src gnome org>]

commit fd5c2933869e091524ee847aca2905962245e3d5
Merge: 8f9645c80 802caa34f
Author: Sam Thursfield <sam afuera me uk>
Date:   Sat Sep 14 13:15:42 2019 +0000

    Merge branch 'sam/test-fixes' into 'master'
    
    functional-tests: Two small fixes
    
    See merge request GNOME/tracker!135

 .gitlab-ci.yml                                         | 2 ++
 tests/functional-tests/17-ontology-changes.py          | 1 +
 tests/functional-tests/ipc/meson.build                 | 2 ++
 tests/functional-tests/ipc/test-insert-or-replace.vala | 4 ++--
 utils/trackertestutils/__main__.py                     | 6 +++++-
 5 files changed, 12 insertions(+), 3 deletions(-)
---