nixos/tests: fix mpd test
This commit is contained in:
parent
1eea0f52b8
commit
4d9899ef13
|
@ -1,4 +1,4 @@
|
|||
import ./make-test.nix ({ pkgs, ... }:
|
||||
import ./make-test.nix ({ pkgs, lib, ... }:
|
||||
let
|
||||
track = pkgs.fetchurl {
|
||||
# Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in
|
||||
|
@ -50,7 +50,8 @@ import ./make-test.nix ({ pkgs, ... }:
|
|||
{ ... }: { };
|
||||
|
||||
serverALSA =
|
||||
{ ... }: (mkServer {
|
||||
{ ... }: lib.mkMerge [
|
||||
(mkServer {
|
||||
mpd = defaultMpdCfg // {
|
||||
network.listenAddress = "any";
|
||||
extraConfig = ''
|
||||
|
@ -61,12 +62,14 @@ import ./make-test.nix ({ pkgs, ... }:
|
|||
}
|
||||
'';
|
||||
};
|
||||
|
||||
musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; };
|
||||
}) // { networking.firewall.allowedTCPPorts = [ 6600 ]; };
|
||||
})
|
||||
{ networking.firewall.allowedTCPPorts = [ 6600 ]; }
|
||||
];
|
||||
|
||||
serverPulseAudio =
|
||||
{ ... }: (mkServer {
|
||||
{ ... }: lib.mkMerge [
|
||||
(mkServer {
|
||||
mpd = defaultMpdCfg // {
|
||||
extraConfig = ''
|
||||
audio_output {
|
||||
|
@ -77,7 +80,17 @@ import ./make-test.nix ({ pkgs, ... }:
|
|||
};
|
||||
|
||||
musicService = with defaultCfg; musicService { inherit user group musicDirectory; };
|
||||
}) // { hardware.pulseaudio.enable = true; };
|
||||
})
|
||||
{
|
||||
hardware.pulseaudio = {
|
||||
enable = true;
|
||||
systemWide = true;
|
||||
tcp.enable = true;
|
||||
tcp.anonymousClients.allowAll = true;
|
||||
};
|
||||
systemd.services.mpd.environment.PULSE_SERVER = "localhost";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
@ -110,6 +123,7 @@ import ./make-test.nix ({ pkgs, ... }:
|
|||
play_some_music($serverALSA);
|
||||
play_some_music($serverPulseAudio);
|
||||
|
||||
$client->waitForUnit("multi-user.target");
|
||||
$client->succeed("$mpc -h serverALSA status");
|
||||
|
||||
# The PulseAudio-based server is configured not to accept external client connections
|
||||
|
|
Loading…
Reference in a new issue