[glib: 4/4] Merge branch '1679-socket-service-flaky' into 'master'

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 4d12174663f69729635cf5d4c470d24639782619
Merge: 86201989e 07414e17e
Author: Michael Catanzaro <mcatanzaro posteo net>
Date:   Fri Feb 22 01:33:50 2019 +0000

    Merge branch '1679-socket-service-flaky' into 'master'
    
    Resolve "socket-service test is flaky"
    
    Closes #1679
    
    See merge request GNOME/glib!687

 gio/tests/meson.build      |  2 +-
 gio/tests/socket-service.c | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)
---