[glib: 5/5] Merge branch '1712-gdbus-proxy-flaky' into 'master'

[Simon McVittie <smcv src gnome org>]

commit f3610f14c4f5a96dc1e50a54e05208f72bdd6096
Merge: 23a99f71c 49642bfeb
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Thu Mar 7 15:12:30 2019 +0000

    Merge branch '1712-gdbus-proxy-flaky' into 'master'
    
    Minor improvements to gdbus-proxy test
    
    Closes #1712
    
    See merge request GNOME/glib!715

 gio/tests/gdbus-proxy.c      | 153 ++++++++++++++++++++++---------------------
 gio/tests/gdbus-testserver.c |   1 +
 glib.supp                    |   7 ++
 3 files changed, 86 insertions(+), 75 deletions(-)
---