[glib: 2/2] Merge branch 'wip/laney/skip-memory-monitor-tests-if-dbusmock-is-too-old' into 'master'

[Iain Lane <iainl src gnome org>]

commit b876325c5f477c0525970a5537b4d7310e2c0b5f
Merge: b413c50dc 0d4f1a9b2
Author: Iain Lane <iain orangesquash org uk>
Date:   Wed Jan 22 08:13:04 2020 +0000

    Merge branch 'wip/laney/skip-memory-monitor-tests-if-dbusmock-is-too-old' into 'master'
    
    tests: Skip GMemoryMonitor tests if the dbusmock template is not available
    
    See merge request GNOME/glib!1296

 gio/tests/memory-monitor-dbus.py.in   | 8 ++++++--
 gio/tests/memory-monitor-portal.py.in | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)
---