Resolve "socket-service test is flaky"

Merged Philip Withnall requested to merge pwithnall/glib:1679-socket-service-flaky into master

Two orthogonal fixes to fix races in the socket-service test.

Closes #1679 (closed)

Merge request reports