movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge pull request #40373 from xeji/fix-mesos-test

Browse source 
nixos/mesos: fix non-deterministic service and test failure
This commit is contained in:
xeji 2018-05-13 19:57:24 +02:00 • committed by GitHub
commit c482b41f40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/misc/mesos-slave.nix
View file

@ -187,7 +187,7 @@ in {
systemd.services.mesos-slave = { systemd.services.mesos-slave = {
description = "Mesos Slave"; description = "Mesos Slave";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ;
path = [ pkgs.runtimeShellPackage ]; path = [ pkgs.runtimeShellPackage ];
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''

4
nixos/tests/mesos.nix
View file

@ -66,9 +66,11 @@ import ./make-test.nix ({ pkgs, ...} : rec {
testScript = testScript =
'' ''
startAll; startAll;
$master->waitForUnit("zookeeper.service");
$master->waitForUnit("mesos-master.service"); $master->waitForUnit("mesos-master.service");
$slave->waitForUnit("docker.service");
$slave->waitForUnit("mesos-slave.service"); $slave->waitForUnit("mesos-slave.service");
$master->waitForOpenPort(2181);
$master->waitForOpenPort(5050); $master->waitForOpenPort(5050);
$slave->waitForOpenPort(5051); $slave->waitForOpenPort(5051);