70b3ac8378
Test failed sporadically on Hydra, probably due to timing issues. These changes should make that less likely to occur.
*** NixOS *** NixOS is a Linux distribution based on the purely functional package management system Nix. More information can be found at http://nixos.org/nixos and in the manual in doc/manual.