From 0d2a4ed49c81a0cda44b406d454dc58637e94c3a Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 11 May 2018 19:26:35 +0200
Subject: [PATCH 1/2] nixos/tests/mesos: wait for all services and ports

to be available before sending requests.
Avoids non-deterministic test failure.
---
 nixos/tests/mesos.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix
index 34671df047c8..007d7ac21603 100644
--- a/nixos/tests/mesos.nix
+++ b/nixos/tests/mesos.nix
@@ -66,9 +66,11 @@ import ./make-test.nix ({ pkgs, ...} : rec {
   testScript =
     ''
       startAll;
+      $master->waitForUnit("zookeeper.service");
       $master->waitForUnit("mesos-master.service");
+      $slave->waitForUnit("docker.service");
       $slave->waitForUnit("mesos-slave.service");
-
+      $master->waitForOpenPort(2181);
       $master->waitForOpenPort(5050);
       $slave->waitForOpenPort(5051);
 

From ec00b6fbb3669e1852f537a8b624c6102f3eeb32 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 11 May 2018 19:29:33 +0200
Subject: [PATCH 2/2] nixos/mesos-slave: start after docker

If docker is enabled, start mesos-slave.service after docker.service
to avoid a race condition that could result in mesos-slave to fail
with "Failed to create docker: Timed out getting docker version"
---
 nixos/modules/services/misc/mesos-slave.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
index effa29b64f63..468c7f36ecc5 100644
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -187,7 +187,7 @@ in {
     systemd.services.mesos-slave = {
       description = "Mesos Slave";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ;
       path = [ pkgs.runtimeShellPackage ];
       serviceConfig = {
         ExecStart = ''