public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/tests: fix mpd test

Browse Source
This commit is contained in:
Franz Pletz 2019-11-13 16:41:36 +01:00
parent 1eea0f52b8
commit 4d9899ef13
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nixos/tests/mpd.nix
View File

@ -1,4 +1,4 @@
import ./make-test.nix ({ pkgs, ... }: import ./make-test.nix ({ pkgs, lib, ... }:
let let
track = pkgs.fetchurl { track = pkgs.fetchurl {
# Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in # 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 = serverALSA =
{ ... }: (mkServer { { ... }: lib.mkMerge [
(mkServer {
mpd = defaultMpdCfg // { mpd = defaultMpdCfg // {
network.listenAddress = "any"; network.listenAddress = "any";
extraConfig = '' extraConfig = ''
@ -61,12 +62,14 @@ import ./make-test.nix ({ pkgs, ... }:
} }
''; '';
}; };
musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; }; musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; };
}) // { networking.firewall.allowedTCPPorts = [ 6600 ]; }; })
{ networking.firewall.allowedTCPPorts = [ 6600 ]; }
];
serverPulseAudio = serverPulseAudio =
{ ... }: (mkServer { { ... }: lib.mkMerge [
(mkServer {
mpd = defaultMpdCfg // { mpd = defaultMpdCfg // {
extraConfig = '' extraConfig = ''
audio_output { audio_output {
@ -77,7 +80,17 @@ import ./make-test.nix ({ pkgs, ... }:
}; };
musicService = with defaultCfg; musicService { inherit user group musicDirectory; }; 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 = '' testScript = ''
@ -110,6 +123,7 @@ import ./make-test.nix ({ pkgs, ... }:
play_some_music($serverALSA); play_some_music($serverALSA);
play_some_music($serverPulseAudio); play_some_music($serverPulseAudio);
$client->waitForUnit("multi-user.target");
$client->succeed("$mpc -h serverALSA status"); $client->succeed("$mpc -h serverALSA status");
# The PulseAudio-based server is configured not to accept external client connections # The PulseAudio-based server is configured not to accept external client connections